diff --git a/airdef-mod/assets/airdef/blockstates/buk_chassis_burnt.json b/airdef-mod/assets/airdef/blockstates/buk_chassis_burnt.json new file mode 100644 index 0000000..4ae6750 --- /dev/null +++ b/airdef-mod/assets/airdef/blockstates/buk_chassis_burnt.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "airdef:block/buk_chassis_burnt" + } + } +} \ No newline at end of file diff --git a/airdef-mod/assets/airdef/blockstates/buk_rails_burnt.json b/airdef-mod/assets/airdef/blockstates/buk_rails_burnt.json new file mode 100644 index 0000000..b532f9f --- /dev/null +++ b/airdef-mod/assets/airdef/blockstates/buk_rails_burnt.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "airdef:block/buk_rails_burnt" + } + } +} \ No newline at end of file diff --git a/airdef-mod/assets/airdef/blockstates/buk_turret_burnt.json b/airdef-mod/assets/airdef/blockstates/buk_turret_burnt.json new file mode 100644 index 0000000..09c2cd4 --- /dev/null +++ b/airdef-mod/assets/airdef/blockstates/buk_turret_burnt.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "airdef:block/buk_turret_burnt" + } + } +} \ No newline at end of file diff --git a/airdef-mod/assets/airdef/blockstates/depot_burnt.json b/airdef-mod/assets/airdef/blockstates/depot_burnt.json new file mode 100644 index 0000000..952e856 --- /dev/null +++ b/airdef-mod/assets/airdef/blockstates/depot_burnt.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "airdef:block/depot_burnt" + } + } +} \ No newline at end of file diff --git a/airdef-mod/assets/airdef/blockstates/ew_truck_burnt.json b/airdef-mod/assets/airdef/blockstates/ew_truck_burnt.json new file mode 100644 index 0000000..8ec69c3 --- /dev/null +++ b/airdef-mod/assets/airdef/blockstates/ew_truck_burnt.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "airdef:block/ew_truck_burnt" + } + } +} \ No newline at end of file diff --git a/airdef-mod/assets/airdef/blockstates/gepard_guns_burnt.json b/airdef-mod/assets/airdef/blockstates/gepard_guns_burnt.json new file mode 100644 index 0000000..32bb4f8 --- /dev/null +++ b/airdef-mod/assets/airdef/blockstates/gepard_guns_burnt.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "airdef:block/gepard_guns_burnt" + } + } +} \ No newline at end of file diff --git a/airdef-mod/assets/airdef/blockstates/gepard_hull_burnt.json b/airdef-mod/assets/airdef/blockstates/gepard_hull_burnt.json new file mode 100644 index 0000000..64d5413 --- /dev/null +++ b/airdef-mod/assets/airdef/blockstates/gepard_hull_burnt.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "airdef:block/gepard_hull_burnt" + } + } +} \ No newline at end of file diff --git a/airdef-mod/assets/airdef/blockstates/gepard_turret_burnt.json b/airdef-mod/assets/airdef/blockstates/gepard_turret_burnt.json new file mode 100644 index 0000000..435a873 --- /dev/null +++ b/airdef-mod/assets/airdef/blockstates/gepard_turret_burnt.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "airdef:block/gepard_turret_burnt" + } + } +} \ No newline at end of file diff --git a/airdef-mod/assets/airdef/blockstates/irist_chassis_burnt.json b/airdef-mod/assets/airdef/blockstates/irist_chassis_burnt.json new file mode 100644 index 0000000..e42523d --- /dev/null +++ b/airdef-mod/assets/airdef/blockstates/irist_chassis_burnt.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "airdef:block/irist_chassis_burnt" + } + } +} \ No newline at end of file diff --git a/airdef-mod/assets/airdef/blockstates/irist_tubes_burnt.json b/airdef-mod/assets/airdef/blockstates/irist_tubes_burnt.json new file mode 100644 index 0000000..26f8604 --- /dev/null +++ b/airdef-mod/assets/airdef/blockstates/irist_tubes_burnt.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "airdef:block/irist_tubes_burnt" + } + } +} \ No newline at end of file diff --git a/airdef-mod/assets/airdef/blockstates/nasams_launcher_burnt.json b/airdef-mod/assets/airdef/blockstates/nasams_launcher_burnt.json new file mode 100644 index 0000000..ab6d8d2 --- /dev/null +++ b/airdef-mod/assets/airdef/blockstates/nasams_launcher_burnt.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "airdef:block/nasams_launcher_burnt" + } + } +} \ No newline at end of file diff --git a/airdef-mod/assets/airdef/blockstates/nasams_trailer_burnt.json b/airdef-mod/assets/airdef/blockstates/nasams_trailer_burnt.json new file mode 100644 index 0000000..126c42a --- /dev/null +++ b/airdef-mod/assets/airdef/blockstates/nasams_trailer_burnt.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "airdef:block/nasams_trailer_burnt" + } + } +} \ No newline at end of file diff --git a/airdef-mod/assets/airdef/blockstates/p1sun_launcher_burnt.json b/airdef-mod/assets/airdef/blockstates/p1sun_launcher_burnt.json new file mode 100644 index 0000000..70ee874 --- /dev/null +++ b/airdef-mod/assets/airdef/blockstates/p1sun_launcher_burnt.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "airdef:block/p1sun_launcher_burnt" + } + } +} \ No newline at end of file diff --git a/airdef-mod/assets/airdef/blockstates/pantsir_pack_burnt.json b/airdef-mod/assets/airdef/blockstates/pantsir_pack_burnt.json new file mode 100644 index 0000000..8712c9c --- /dev/null +++ b/airdef-mod/assets/airdef/blockstates/pantsir_pack_burnt.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "airdef:block/pantsir_pack_burnt" + } + } +} \ No newline at end of file diff --git a/airdef-mod/assets/airdef/blockstates/pantsir_truck_burnt.json b/airdef-mod/assets/airdef/blockstates/pantsir_truck_burnt.json new file mode 100644 index 0000000..0d9093e --- /dev/null +++ b/airdef-mod/assets/airdef/blockstates/pantsir_truck_burnt.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "airdef:block/pantsir_truck_burnt" + } + } +} \ No newline at end of file diff --git a/airdef-mod/assets/airdef/blockstates/pantsir_turret_burnt.json b/airdef-mod/assets/airdef/blockstates/pantsir_turret_burnt.json new file mode 100644 index 0000000..e849863 --- /dev/null +++ b/airdef-mod/assets/airdef/blockstates/pantsir_turret_burnt.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "airdef:block/pantsir_turret_burnt" + } + } +} \ No newline at end of file diff --git a/airdef-mod/assets/airdef/blockstates/patriot_launcher_burnt.json b/airdef-mod/assets/airdef/blockstates/patriot_launcher_burnt.json new file mode 100644 index 0000000..b300387 --- /dev/null +++ b/airdef-mod/assets/airdef/blockstates/patriot_launcher_burnt.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "airdef:block/patriot_launcher_burnt" + } + } +} \ No newline at end of file diff --git a/airdef-mod/assets/airdef/blockstates/patriot_trailer_burnt.json b/airdef-mod/assets/airdef/blockstates/patriot_trailer_burnt.json new file mode 100644 index 0000000..e240c55 --- /dev/null +++ b/airdef-mod/assets/airdef/blockstates/patriot_trailer_burnt.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "airdef:block/patriot_trailer_burnt" + } + } +} \ No newline at end of file diff --git a/airdef-mod/assets/airdef/blockstates/radar_truck_burnt.json b/airdef-mod/assets/airdef/blockstates/radar_truck_burnt.json new file mode 100644 index 0000000..5806623 --- /dev/null +++ b/airdef-mod/assets/airdef/blockstates/radar_truck_burnt.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "airdef:block/radar_truck_burnt" + } + } +} \ No newline at end of file diff --git a/airdef-mod/assets/airdef/blockstates/s400_chassis_burnt.json b/airdef-mod/assets/airdef/blockstates/s400_chassis_burnt.json new file mode 100644 index 0000000..de0b384 --- /dev/null +++ b/airdef-mod/assets/airdef/blockstates/s400_chassis_burnt.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "airdef:block/s400_chassis_burnt" + } + } +} \ No newline at end of file diff --git a/airdef-mod/assets/airdef/blockstates/s400_tubes_burnt.json b/airdef-mod/assets/airdef/blockstates/s400_tubes_burnt.json new file mode 100644 index 0000000..1baf821 --- /dev/null +++ b/airdef-mod/assets/airdef/blockstates/s400_tubes_burnt.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "airdef:block/s400_tubes_burnt" + } + } +} \ No newline at end of file diff --git a/airdef-mod/assets/airdef/blockstates/s500_chassis_burnt.json b/airdef-mod/assets/airdef/blockstates/s500_chassis_burnt.json new file mode 100644 index 0000000..fa5f9d4 --- /dev/null +++ b/airdef-mod/assets/airdef/blockstates/s500_chassis_burnt.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "airdef:block/s500_chassis_burnt" + } + } +} \ No newline at end of file diff --git a/airdef-mod/assets/airdef/blockstates/s500_tubes_burnt.json b/airdef-mod/assets/airdef/blockstates/s500_tubes_burnt.json new file mode 100644 index 0000000..f283f89 --- /dev/null +++ b/airdef-mod/assets/airdef/blockstates/s500_tubes_burnt.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "airdef:block/s500_tubes_burnt" + } + } +} \ No newline at end of file diff --git a/airdef-mod/assets/airdef/blockstates/searchlight_burnt.json b/airdef-mod/assets/airdef/blockstates/searchlight_burnt.json new file mode 100644 index 0000000..c1e21a5 --- /dev/null +++ b/airdef-mod/assets/airdef/blockstates/searchlight_burnt.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "airdef:block/searchlight_burnt" + } + } +} \ No newline at end of file diff --git a/airdef-mod/assets/airdef/blockstates/searchlight_head_burnt.json b/airdef-mod/assets/airdef/blockstates/searchlight_head_burnt.json new file mode 100644 index 0000000..17c082a --- /dev/null +++ b/airdef-mod/assets/airdef/blockstates/searchlight_head_burnt.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "airdef:block/searchlight_head_burnt" + } + } +} \ No newline at end of file diff --git a/airdef-mod/assets/airdef/blockstates/tor_chassis_burnt.json b/airdef-mod/assets/airdef/blockstates/tor_chassis_burnt.json new file mode 100644 index 0000000..69c6bc7 --- /dev/null +++ b/airdef-mod/assets/airdef/blockstates/tor_chassis_burnt.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "airdef:block/tor_chassis_burnt" + } + } +} \ No newline at end of file diff --git a/airdef-mod/assets/airdef/blockstates/tor_turret_burnt.json b/airdef-mod/assets/airdef/blockstates/tor_turret_burnt.json new file mode 100644 index 0000000..8175c1c --- /dev/null +++ b/airdef-mod/assets/airdef/blockstates/tor_turret_burnt.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "airdef:block/tor_turret_burnt" + } + } +} \ No newline at end of file diff --git a/airdef-mod/assets/airdef/blockstates/tzm_truck_burnt.json b/airdef-mod/assets/airdef/blockstates/tzm_truck_burnt.json new file mode 100644 index 0000000..22ed36a --- /dev/null +++ b/airdef-mod/assets/airdef/blockstates/tzm_truck_burnt.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "airdef:block/tzm_truck_burnt" + } + } +} \ No newline at end of file diff --git a/airdef-mod/assets/airdef/lang/en_us.json b/airdef-mod/assets/airdef/lang/en_us.json index 76141c3..3c4944d 100644 --- a/airdef-mod/assets/airdef/lang/en_us.json +++ b/airdef-mod/assets/airdef/lang/en_us.json @@ -61,6 +61,34 @@ "block.airdef.beam": "Луч прожектора", "block.airdef.flare": "Осветительная ракета", "block.airdef.reentry": "Боевой блок", + "block.airdef.patriot_trailer_burnt": "Полуприцеп (остов)", + "block.airdef.patriot_launcher_burnt": "ПУ M903 (остов)", + "block.airdef.gepard_hull_burnt": "Корпус Гепарда (остов)", + "block.airdef.gepard_turret_burnt": "Башня Гепарда (остов)", + "block.airdef.gepard_guns_burnt": "Пушки Гепарда (остов)", + "block.airdef.pantsir_truck_burnt": "Шасси Панциря (остов)", + "block.airdef.pantsir_turret_burnt": "Модуль Панциря (остов)", + "block.airdef.pantsir_pack_burnt": "Ракеты и пушки Панциря (остов)", + "block.airdef.s400_chassis_burnt": "Шасси С-400 (остов)", + "block.airdef.s400_tubes_burnt": "ТПК 48Н6 (остов)", + "block.airdef.s500_chassis_burnt": "Шасси С-500 (остов)", + "block.airdef.s500_tubes_burnt": "ТПК 77Н6 (остов)", + "block.airdef.irist_chassis_burnt": "Шасси IRIS-T SLM (остов)", + "block.airdef.irist_tubes_burnt": "Пакет IRIS-T (остов)", + "block.airdef.nasams_trailer_burnt": "Прицеп NASAMS (остов)", + "block.airdef.nasams_launcher_burnt": "Пусковая NASAMS (остов)", + "block.airdef.buk_chassis_burnt": "Шасси Бука (остов)", + "block.airdef.buk_turret_burnt": "Башня Бука (остов)", + "block.airdef.buk_rails_burnt": "Ракеты Бука (остов)", + "block.airdef.tor_chassis_burnt": "Шасси Тора (остов)", + "block.airdef.tor_turret_burnt": "Башня Тора (остов)", + "block.airdef.p1sun_launcher_burnt": "Пусковая P1-SUN (остов)", + "block.airdef.radar_truck_burnt": "Шасси РЛС (остов)", + "block.airdef.depot_burnt": "Склад боеприпасов (остов)", + "block.airdef.tzm_truck_burnt": "Транспортно-заряжающая машина (остов)", + "block.airdef.ew_truck_burnt": "Станция РЭБ (остов)", + "block.airdef.searchlight_burnt": "Прожектор (остов)", + "block.airdef.searchlight_head_burnt": "Голова прожектора (остов)", "item.airdef.designator": "Целеуказатель", "item.airdef.launch_shahed": "Пуск: Шахед-136", "item.airdef.launch_geran3": "Пуск: Герань-3", diff --git a/airdef-mod/assets/airdef/lang/ru_ru.json b/airdef-mod/assets/airdef/lang/ru_ru.json index 76141c3..3c4944d 100644 --- a/airdef-mod/assets/airdef/lang/ru_ru.json +++ b/airdef-mod/assets/airdef/lang/ru_ru.json @@ -61,6 +61,34 @@ "block.airdef.beam": "Луч прожектора", "block.airdef.flare": "Осветительная ракета", "block.airdef.reentry": "Боевой блок", + "block.airdef.patriot_trailer_burnt": "Полуприцеп (остов)", + "block.airdef.patriot_launcher_burnt": "ПУ M903 (остов)", + "block.airdef.gepard_hull_burnt": "Корпус Гепарда (остов)", + "block.airdef.gepard_turret_burnt": "Башня Гепарда (остов)", + "block.airdef.gepard_guns_burnt": "Пушки Гепарда (остов)", + "block.airdef.pantsir_truck_burnt": "Шасси Панциря (остов)", + "block.airdef.pantsir_turret_burnt": "Модуль Панциря (остов)", + "block.airdef.pantsir_pack_burnt": "Ракеты и пушки Панциря (остов)", + "block.airdef.s400_chassis_burnt": "Шасси С-400 (остов)", + "block.airdef.s400_tubes_burnt": "ТПК 48Н6 (остов)", + "block.airdef.s500_chassis_burnt": "Шасси С-500 (остов)", + "block.airdef.s500_tubes_burnt": "ТПК 77Н6 (остов)", + "block.airdef.irist_chassis_burnt": "Шасси IRIS-T SLM (остов)", + "block.airdef.irist_tubes_burnt": "Пакет IRIS-T (остов)", + "block.airdef.nasams_trailer_burnt": "Прицеп NASAMS (остов)", + "block.airdef.nasams_launcher_burnt": "Пусковая NASAMS (остов)", + "block.airdef.buk_chassis_burnt": "Шасси Бука (остов)", + "block.airdef.buk_turret_burnt": "Башня Бука (остов)", + "block.airdef.buk_rails_burnt": "Ракеты Бука (остов)", + "block.airdef.tor_chassis_burnt": "Шасси Тора (остов)", + "block.airdef.tor_turret_burnt": "Башня Тора (остов)", + "block.airdef.p1sun_launcher_burnt": "Пусковая P1-SUN (остов)", + "block.airdef.radar_truck_burnt": "Шасси РЛС (остов)", + "block.airdef.depot_burnt": "Склад боеприпасов (остов)", + "block.airdef.tzm_truck_burnt": "Транспортно-заряжающая машина (остов)", + "block.airdef.ew_truck_burnt": "Станция РЭБ (остов)", + "block.airdef.searchlight_burnt": "Прожектор (остов)", + "block.airdef.searchlight_head_burnt": "Голова прожектора (остов)", "item.airdef.designator": "Целеуказатель", "item.airdef.launch_shahed": "Пуск: Шахед-136", "item.airdef.launch_geran3": "Пуск: Герань-3", diff --git a/airdef-mod/assets/airdef/models/block/amraam_missile.json b/airdef-mod/assets/airdef/models/block/amraam_missile.json index 133d941..5571f67 100644 --- a/airdef-mod/assets/airdef/models/block/amraam_missile.json +++ b/airdef-mod/assets/airdef/models/block/amraam_missile.json @@ -2,20 +2,23 @@ "ambientocclusion": false, "textures": { "nose_dark": "airdef:block/nose_dark", + "rm_white": "airdef:block/rm_white", + "rm_white_t": "airdef:block/rm_white_t", "white": "airdef:block/white", - "nozzle": "airdef:block/nozzle", + "bare_nozzle": "airdef:block/bare_nozzle", + "glow_ember": "airdef:block/glow_ember", "particle": "airdef:block/nose_dark" }, "elements": [ { "from": [ - 7.333333333333333, - 7.333333333333333, + 7.294558312447602, + 7.294558312447602, -16.0 ], "to": [ - 8.666666666666666, - 8.666666666666666, + 8.705441687552398, + 8.705441687552398, -13.666666666666666 ], "faces": { @@ -23,8 +26,8 @@ "uv": [ 0, 0, - 1.333333333333333, - 1.333333333333333 + 1.4108833751047953, + 1.4108833751047953 ], "texture": "#nose_dark" }, @@ -32,8 +35,8 @@ "uv": [ 0, 0, - 1.333333333333333, - 1.333333333333333 + 1.4108833751047953, + 1.4108833751047953 ], "texture": "#nose_dark" }, @@ -42,7 +45,7 @@ 0, 0, 2.333333333333334, - 1.333333333333333 + 1.4108833751047953 ], "texture": "#nose_dark" }, @@ -51,7 +54,7 @@ 0, 0, 2.333333333333334, - 1.333333333333333 + 1.4108833751047953 ], "texture": "#nose_dark" }, @@ -59,7 +62,7 @@ "uv": [ 0, 0, - 1.333333333333333, + 1.4108833751047953, 2.333333333333334 ], "texture": "#nose_dark" @@ -68,7 +71,7 @@ "uv": [ 0, 0, - 1.333333333333333, + 1.4108833751047953, 2.333333333333334 ], "texture": "#nose_dark" @@ -77,22 +80,22 @@ }, { "from": [ - 7.0, - 7.0, - -13.666666666666666 + 7.294558312447602, + 7.294558312447602, + -15.97 ], "to": [ - 9.0, - 9.0, - -11.333333333333332 + 8.705441687552398, + 8.705441687552398, + -13.696666666666665 ], "faces": { "north": { "uv": [ 0, 0, - 2.0, - 2.0 + 1.4108833751047953, + 1.4108833751047953 ], "texture": "#nose_dark" }, @@ -100,8 +103,85 @@ "uv": [ 0, 0, - 2.0, - 2.0 + 1.4108833751047953, + 1.4108833751047953 + ], + "texture": "#nose_dark" + }, + "east": { + "uv": [ + 0, + 0, + 2.273333333333335, + 1.4108833751047953 + ], + "texture": "#nose_dark" + }, + "west": { + "uv": [ + 0, + 0, + 2.273333333333335, + 1.4108833751047953 + ], + "texture": "#nose_dark" + }, + "up": { + "uv": [ + 0, + 0, + 1.4108833751047953, + 2.273333333333335 + ], + "texture": "#nose_dark" + }, + "down": { + "uv": [ + 0, + 0, + 1.4108833751047953, + 2.273333333333335 + ], + "texture": "#nose_dark" + } + }, + "rotation": { + "angle": 45, + "axis": "z", + "origin": [ + 8.0, + 8.0, + -14.833333333333332 + ] + } + }, + { + "from": [ + 6.8507775398726425, + 6.8507775398726425, + -13.666666666666666 + ], + "to": [ + 9.149222460127358, + 9.149222460127358, + -11.333333333333332 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 2.298444920254716, + 2.298444920254716 + ], + "texture": "#nose_dark" + }, + "south": { + "uv": [ + 0, + 0, + 2.298444920254716, + 2.298444920254716 ], "texture": "#nose_dark" }, @@ -110,7 +190,7 @@ 0, 0, 2.333333333333334, - 2.0 + 2.298444920254716 ], "texture": "#nose_dark" }, @@ -119,7 +199,7 @@ 0, 0, 2.333333333333334, - 2.0 + 2.298444920254716 ], "texture": "#nose_dark" }, @@ -127,7 +207,7 @@ "uv": [ 0, 0, - 2.0, + 2.298444920254716, 2.333333333333334 ], "texture": "#nose_dark" @@ -136,7 +216,7 @@ "uv": [ 0, 0, - 2.0, + 2.298444920254716, 2.333333333333334 ], "texture": "#nose_dark" @@ -145,13 +225,90 @@ }, { "from": [ - 6.666666666666666, - 6.666666666666666, + 6.8507775398726425, + 6.8507775398726425, + -13.636666666666667 + ], + "to": [ + 9.149222460127358, + 9.149222460127358, + -11.363333333333332 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 2.298444920254716, + 2.298444920254716 + ], + "texture": "#nose_dark" + }, + "south": { + "uv": [ + 0, + 0, + 2.298444920254716, + 2.298444920254716 + ], + "texture": "#nose_dark" + }, + "east": { + "uv": [ + 0, + 0, + 2.273333333333335, + 2.298444920254716 + ], + "texture": "#nose_dark" + }, + "west": { + "uv": [ + 0, + 0, + 2.273333333333335, + 2.298444920254716 + ], + "texture": "#nose_dark" + }, + "up": { + "uv": [ + 0, + 0, + 2.298444920254716, + 2.273333333333335 + ], + "texture": "#nose_dark" + }, + "down": { + "uv": [ + 0, + 0, + 2.298444920254716, + 2.273333333333335 + ], + "texture": "#nose_dark" + } + }, + "rotation": { + "angle": 45, + "axis": "z", + "origin": [ + 8.0, + 8.0, + -12.5 + ] + } + }, + { + "from": [ + 6.517798430927714, + 6.517798430927714, -11.333333333333332 ], "to": [ - 9.333333333333334, - 9.333333333333334, + 9.482201569072286, + 9.482201569072286, -9.0 ], "faces": { @@ -159,8 +316,8 @@ "uv": [ 0, 0, - 2.666666666666668, - 2.666666666666668 + 2.964403138144572, + 2.964403138144572 ], "texture": "#nose_dark" }, @@ -168,8 +325,8 @@ "uv": [ 0, 0, - 2.666666666666668, - 2.666666666666668 + 2.964403138144572, + 2.964403138144572 ], "texture": "#nose_dark" }, @@ -178,7 +335,7 @@ 0, 0, 2.333333333333332, - 2.666666666666668 + 2.964403138144572 ], "texture": "#nose_dark" }, @@ -187,7 +344,7 @@ 0, 0, 2.333333333333332, - 2.666666666666668 + 2.964403138144572 ], "texture": "#nose_dark" }, @@ -195,7 +352,7 @@ "uv": [ 0, 0, - 2.666666666666668, + 2.964403138144572, 2.333333333333332 ], "texture": "#nose_dark" @@ -204,7 +361,7 @@ "uv": [ 0, 0, - 2.666666666666668, + 2.964403138144572, 2.333333333333332 ], "texture": "#nose_dark" @@ -213,90 +370,244 @@ }, { "from": [ - 6.5, - 6.5, + 6.517798430927714, + 6.517798430927714, + -11.303333333333333 + ], + "to": [ + 9.482201569072286, + 9.482201569072286, + -9.03 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 2.964403138144572, + 2.964403138144572 + ], + "texture": "#nose_dark" + }, + "south": { + "uv": [ + 0, + 0, + 2.964403138144572, + 2.964403138144572 + ], + "texture": "#nose_dark" + }, + "east": { + "uv": [ + 0, + 0, + 2.2733333333333334, + 2.964403138144572 + ], + "texture": "#nose_dark" + }, + "west": { + "uv": [ + 0, + 0, + 2.2733333333333334, + 2.964403138144572 + ], + "texture": "#nose_dark" + }, + "up": { + "uv": [ + 0, + 0, + 2.964403138144572, + 2.2733333333333334 + ], + "texture": "#nose_dark" + }, + "down": { + "uv": [ + 0, + 0, + 2.964403138144572, + 2.2733333333333334 + ], + "texture": "#nose_dark" + } + }, + "rotation": { + "angle": 45, + "axis": "z", + "origin": [ + 8.0, + 8.0, + -10.166666666666666 + ] + } + }, + { + "from": [ + 6.4293700000000005, + 6.4293700000000005, -9.0 ], "to": [ - 9.5, - 9.5, - 26.0 + 9.57063, + 9.57063, + 24.0 ], "faces": { "north": { "uv": [ 0, 0, - 3.0, - 3.0 + 3.141259999999999, + 3.141259999999999 ], - "texture": "#white" + "texture": "#rm_white" }, "south": { "uv": [ 0, 0, - 3.0, - 3.0 + 3.141259999999999, + 3.141259999999999 ], - "texture": "#white" + "texture": "#rm_white" }, "east": { "uv": [ 0, 0, 16, - 3.0 + 3.141259999999999 ], - "texture": "#white" + "texture": "#rm_white" }, "west": { "uv": [ 0, 0, 16, - 3.0 + 3.141259999999999 ], - "texture": "#white" + "texture": "#rm_white" }, "up": { "uv": [ 0, 0, - 3.0, + 3.141259999999999, 16 ], - "texture": "#white" + "texture": "#rm_white_t" }, "down": { "uv": [ 0, 0, - 3.0, + 3.141259999999999, 16 ], - "texture": "#white" + "texture": "#rm_white_t" } } }, { "from": [ - 1.0, - 7.6, + 6.4293700000000005, + 6.4293700000000005, + -8.97 + ], + "to": [ + 9.57063, + 9.57063, + 23.97 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.141259999999999, + 3.141259999999999 + ], + "texture": "#rm_white" + }, + "south": { + "uv": [ + 0, + 0, + 3.141259999999999, + 3.141259999999999 + ], + "texture": "#rm_white" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 3.141259999999999 + ], + "texture": "#rm_white" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 3.141259999999999 + ], + "texture": "#rm_white" + }, + "up": { + "uv": [ + 0, + 0, + 3.141259999999999, + 16 + ], + "texture": "#rm_white_t" + }, + "down": { + "uv": [ + 0, + 0, + 3.141259999999999, + 16 + ], + "texture": "#rm_white_t" + } + }, + "rotation": { + "angle": 45, + "axis": "z", + "origin": [ + 8.0, + 8.0, + 7.499999999999999 + ] + } + }, + { + "from": [ + 9.53, + 7.65, 2.0 ], "to": [ - 6.5, - 8.4, - 9.0 + 12.555, + 8.35, + 8.0 ], "faces": { "north": { "uv": [ 0, 0, - 5.5, - 0.8000000000000007 + 3.0250000000000004, + 0.6999999999999993 ], "texture": "#white" }, @@ -304,8 +615,8 @@ "uv": [ 0, 0, - 5.5, - 0.8000000000000007 + 3.0250000000000004, + 0.6999999999999993 ], "texture": "#white" }, @@ -313,8 +624,8 @@ "uv": [ 0, 0, - 7.0, - 0.8000000000000007 + 6.0, + 0.6999999999999993 ], "texture": "#white" }, @@ -322,8 +633,8 @@ "uv": [ 0, 0, - 7.0, - 0.8000000000000007 + 6.0, + 0.6999999999999993 ], "texture": "#white" }, @@ -331,8 +642,8 @@ "uv": [ 0, 0, - 5.5, - 7.0 + 3.0250000000000004, + 6.0 ], "texture": "#white" }, @@ -340,8 +651,8 @@ "uv": [ 0, 0, - 5.5, - 7.0 + 3.0250000000000004, + 6.0 ], "texture": "#white" } @@ -349,22 +660,22 @@ }, { "from": [ - 9.5, - 7.6, + 3.4450000000000003, + 7.65, 2.0 ], "to": [ - 15.0, - 8.4, - 9.0 + 6.470000000000001, + 8.35, + 8.0 ], "faces": { "north": { "uv": [ 0, 0, - 5.5, - 0.8000000000000007 + 3.0250000000000004, + 0.6999999999999993 ], "texture": "#white" }, @@ -372,8 +683,8 @@ "uv": [ 0, 0, - 5.5, - 0.8000000000000007 + 3.0250000000000004, + 0.6999999999999993 ], "texture": "#white" }, @@ -381,8 +692,8 @@ "uv": [ 0, 0, - 7.0, - 0.8000000000000007 + 6.0, + 0.6999999999999993 ], "texture": "#white" }, @@ -390,8 +701,8 @@ "uv": [ 0, 0, - 7.0, - 0.8000000000000007 + 6.0, + 0.6999999999999993 ], "texture": "#white" }, @@ -399,8 +710,8 @@ "uv": [ 0, 0, - 5.5, - 7.0 + 3.0250000000000004, + 6.0 ], "texture": "#white" }, @@ -408,8 +719,8 @@ "uv": [ 0, 0, - 5.5, - 7.0 + 3.0250000000000004, + 6.0 ], "texture": "#white" } @@ -417,22 +728,158 @@ }, { "from": [ - 7.6, - 1.0, + 12.555, + 7.65, + 5.5 + ], + "to": [ + 15.030000000000001, + 8.35, + 8.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 2.4750000000000014, + 0.6999999999999993 + ], + "texture": "#white" + }, + "south": { + "uv": [ + 0, + 0, + 2.4750000000000014, + 0.6999999999999993 + ], + "texture": "#white" + }, + "east": { + "uv": [ + 0, + 0, + 2.5, + 0.6999999999999993 + ], + "texture": "#white" + }, + "west": { + "uv": [ + 0, + 0, + 2.5, + 0.6999999999999993 + ], + "texture": "#white" + }, + "up": { + "uv": [ + 0, + 0, + 2.4750000000000014, + 2.5 + ], + "texture": "#white" + }, + "down": { + "uv": [ + 0, + 0, + 2.4750000000000014, + 2.5 + ], + "texture": "#white" + } + } + }, + { + "from": [ + 0.9699999999999989, + 7.65, + 5.5 + ], + "to": [ + 3.4450000000000003, + 8.35, + 8.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 2.4750000000000014, + 0.6999999999999993 + ], + "texture": "#white" + }, + "south": { + "uv": [ + 0, + 0, + 2.4750000000000014, + 0.6999999999999993 + ], + "texture": "#white" + }, + "east": { + "uv": [ + 0, + 0, + 2.5, + 0.6999999999999993 + ], + "texture": "#white" + }, + "west": { + "uv": [ + 0, + 0, + 2.5, + 0.6999999999999993 + ], + "texture": "#white" + }, + "up": { + "uv": [ + 0, + 0, + 2.4750000000000014, + 2.5 + ], + "texture": "#white" + }, + "down": { + "uv": [ + 0, + 0, + 2.4750000000000014, + 2.5 + ], + "texture": "#white" + } + } + }, + { + "from": [ + 7.65, + 9.53, 2.0 ], "to": [ - 8.4, - 6.5, - 9.0 + 8.35, + 12.555, + 8.0 ], "faces": { "north": { "uv": [ 0, 0, - 0.8000000000000007, - 5.5 + 0.6999999999999993, + 3.0250000000000004 ], "texture": "#white" }, @@ -440,8 +887,8 @@ "uv": [ 0, 0, - 0.8000000000000007, - 5.5 + 0.6999999999999993, + 3.0250000000000004 ], "texture": "#white" }, @@ -449,8 +896,8 @@ "uv": [ 0, 0, - 7.0, - 5.5 + 6.0, + 3.0250000000000004 ], "texture": "#white" }, @@ -458,8 +905,8 @@ "uv": [ 0, 0, - 7.0, - 5.5 + 6.0, + 3.0250000000000004 ], "texture": "#white" }, @@ -467,8 +914,8 @@ "uv": [ 0, 0, - 0.8000000000000007, - 7.0 + 0.6999999999999993, + 6.0 ], "texture": "#white" }, @@ -476,8 +923,8 @@ "uv": [ 0, 0, - 0.8000000000000007, - 7.0 + 0.6999999999999993, + 6.0 ], "texture": "#white" } @@ -485,22 +932,90 @@ }, { "from": [ - 7.6, - 9.5, + 7.65, + 12.555, + 5.5 + ], + "to": [ + 8.35, + 15.03, + 8.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 2.4749999999999996 + ], + "texture": "#white" + }, + "south": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 2.4749999999999996 + ], + "texture": "#white" + }, + "east": { + "uv": [ + 0, + 0, + 2.5, + 2.4749999999999996 + ], + "texture": "#white" + }, + "west": { + "uv": [ + 0, + 0, + 2.5, + 2.4749999999999996 + ], + "texture": "#white" + }, + "up": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 2.5 + ], + "texture": "#white" + }, + "down": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 2.5 + ], + "texture": "#white" + } + } + }, + { + "from": [ + 7.65, + 3.4449999999999994, 2.0 ], "to": [ - 8.4, - 15.0, - 9.0 + 8.35, + 6.47, + 8.0 ], "faces": { "north": { "uv": [ 0, 0, - 0.8000000000000007, - 5.5 + 0.6999999999999993, + 3.0250000000000004 ], "texture": "#white" }, @@ -508,8 +1023,8 @@ "uv": [ 0, 0, - 0.8000000000000007, - 5.5 + 0.6999999999999993, + 3.0250000000000004 ], "texture": "#white" }, @@ -517,8 +1032,8 @@ "uv": [ 0, 0, - 7.0, - 5.5 + 6.0, + 3.0250000000000004 ], "texture": "#white" }, @@ -526,8 +1041,8 @@ "uv": [ 0, 0, - 7.0, - 5.5 + 6.0, + 3.0250000000000004 ], "texture": "#white" }, @@ -535,8 +1050,8 @@ "uv": [ 0, 0, - 0.8000000000000007, - 7.0 + 0.6999999999999993, + 6.0 ], "texture": "#white" }, @@ -544,8 +1059,8 @@ "uv": [ 0, 0, - 0.8000000000000007, - 7.0 + 0.6999999999999993, + 6.0 ], "texture": "#white" } @@ -553,22 +1068,90 @@ }, { "from": [ - 4.0, - 7.6, + 7.65, + 0.9699999999999998, + 5.5 + ], + "to": [ + 8.35, + 3.4449999999999994, + 8.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 2.4749999999999996 + ], + "texture": "#white" + }, + "south": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 2.4749999999999996 + ], + "texture": "#white" + }, + "east": { + "uv": [ + 0, + 0, + 2.5, + 2.4749999999999996 + ], + "texture": "#white" + }, + "west": { + "uv": [ + 0, + 0, + 2.5, + 2.4749999999999996 + ], + "texture": "#white" + }, + "up": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 2.5 + ], + "texture": "#white" + }, + "down": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 2.5 + ], + "texture": "#white" + } + } + }, + { + "from": [ + 9.53, + 7.65, 19.0 ], "to": [ - 6.5, - 8.4, - 25.0 + 11.620000000000001, + 8.35, + 24.0 ], "faces": { "north": { "uv": [ 0, 0, - 2.5, - 0.8000000000000007 + 2.0900000000000016, + 0.6999999999999993 ], "texture": "#white" }, @@ -576,8 +1159,8 @@ "uv": [ 0, 0, - 2.5, - 0.8000000000000007 + 2.0900000000000016, + 0.6999999999999993 ], "texture": "#white" }, @@ -585,8 +1168,8 @@ "uv": [ 0, 0, - 6.0, - 0.8000000000000007 + 5.0, + 0.6999999999999993 ], "texture": "#white" }, @@ -594,8 +1177,8 @@ "uv": [ 0, 0, - 6.0, - 0.8000000000000007 + 5.0, + 0.6999999999999993 ], "texture": "#white" }, @@ -603,8 +1186,8 @@ "uv": [ 0, 0, - 2.5, - 6.0 + 2.0900000000000016, + 5.0 ], "texture": "#white" }, @@ -612,8 +1195,8 @@ "uv": [ 0, 0, - 2.5, - 6.0 + 2.0900000000000016, + 5.0 ], "texture": "#white" } @@ -621,22 +1204,22 @@ }, { "from": [ - 9.5, - 7.6, + 4.379999999999999, + 7.65, 19.0 ], "to": [ - 12.0, - 8.4, - 25.0 + 6.470000000000001, + 8.35, + 24.0 ], "faces": { "north": { "uv": [ 0, 0, - 2.5, - 0.8000000000000007 + 2.0900000000000016, + 0.6999999999999993 ], "texture": "#white" }, @@ -644,8 +1227,8 @@ "uv": [ 0, 0, - 2.5, - 0.8000000000000007 + 2.0900000000000016, + 0.6999999999999993 ], "texture": "#white" }, @@ -653,8 +1236,8 @@ "uv": [ 0, 0, - 6.0, - 0.8000000000000007 + 5.0, + 0.6999999999999993 ], "texture": "#white" }, @@ -662,8 +1245,8 @@ "uv": [ 0, 0, - 6.0, - 0.8000000000000007 + 5.0, + 0.6999999999999993 ], "texture": "#white" }, @@ -671,8 +1254,8 @@ "uv": [ 0, 0, - 2.5, - 6.0 + 2.0900000000000016, + 5.0 ], "texture": "#white" }, @@ -680,8 +1263,8 @@ "uv": [ 0, 0, - 2.5, - 6.0 + 2.0900000000000016, + 5.0 ], "texture": "#white" } @@ -689,22 +1272,158 @@ }, { "from": [ - 7.6, - 4.0, + 11.620000000000001, + 7.65, + 21.5 + ], + "to": [ + 13.33, + 8.35, + 24.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 1.709999999999999, + 0.6999999999999993 + ], + "texture": "#white" + }, + "south": { + "uv": [ + 0, + 0, + 1.709999999999999, + 0.6999999999999993 + ], + "texture": "#white" + }, + "east": { + "uv": [ + 0, + 0, + 2.5, + 0.6999999999999993 + ], + "texture": "#white" + }, + "west": { + "uv": [ + 0, + 0, + 2.5, + 0.6999999999999993 + ], + "texture": "#white" + }, + "up": { + "uv": [ + 0, + 0, + 1.709999999999999, + 2.5 + ], + "texture": "#white" + }, + "down": { + "uv": [ + 0, + 0, + 1.709999999999999, + 2.5 + ], + "texture": "#white" + } + } + }, + { + "from": [ + 2.67, + 7.65, + 21.5 + ], + "to": [ + 4.379999999999999, + 8.35, + 24.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 1.709999999999999, + 0.6999999999999993 + ], + "texture": "#white" + }, + "south": { + "uv": [ + 0, + 0, + 1.709999999999999, + 0.6999999999999993 + ], + "texture": "#white" + }, + "east": { + "uv": [ + 0, + 0, + 2.5, + 0.6999999999999993 + ], + "texture": "#white" + }, + "west": { + "uv": [ + 0, + 0, + 2.5, + 0.6999999999999993 + ], + "texture": "#white" + }, + "up": { + "uv": [ + 0, + 0, + 1.709999999999999, + 2.5 + ], + "texture": "#white" + }, + "down": { + "uv": [ + 0, + 0, + 1.709999999999999, + 2.5 + ], + "texture": "#white" + } + } + }, + { + "from": [ + 7.65, + 9.53, 19.0 ], "to": [ - 8.4, - 6.5, - 25.0 + 8.35, + 11.62, + 24.0 ], "faces": { "north": { "uv": [ 0, 0, - 0.8000000000000007, - 2.5 + 0.6999999999999993, + 2.09 ], "texture": "#white" }, @@ -712,8 +1431,8 @@ "uv": [ 0, 0, - 0.8000000000000007, - 2.5 + 0.6999999999999993, + 2.09 ], "texture": "#white" }, @@ -721,8 +1440,8 @@ "uv": [ 0, 0, - 6.0, - 2.5 + 5.0, + 2.09 ], "texture": "#white" }, @@ -730,8 +1449,8 @@ "uv": [ 0, 0, - 6.0, - 2.5 + 5.0, + 2.09 ], "texture": "#white" }, @@ -739,8 +1458,8 @@ "uv": [ 0, 0, - 0.8000000000000007, - 6.0 + 0.6999999999999993, + 5.0 ], "texture": "#white" }, @@ -748,8 +1467,8 @@ "uv": [ 0, 0, - 0.8000000000000007, - 6.0 + 0.6999999999999993, + 5.0 ], "texture": "#white" } @@ -757,22 +1476,90 @@ }, { "from": [ - 7.6, - 9.5, + 7.65, + 11.62, + 21.5 + ], + "to": [ + 8.35, + 13.329999999999998, + 24.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 1.709999999999999 + ], + "texture": "#white" + }, + "south": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 1.709999999999999 + ], + "texture": "#white" + }, + "east": { + "uv": [ + 0, + 0, + 2.5, + 1.709999999999999 + ], + "texture": "#white" + }, + "west": { + "uv": [ + 0, + 0, + 2.5, + 1.709999999999999 + ], + "texture": "#white" + }, + "up": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 2.5 + ], + "texture": "#white" + }, + "down": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 2.5 + ], + "texture": "#white" + } + } + }, + { + "from": [ + 7.65, + 4.38, 19.0 ], "to": [ - 8.4, - 12.0, - 25.0 + 8.35, + 6.47, + 24.0 ], "faces": { "north": { "uv": [ 0, 0, - 0.8000000000000007, - 2.5 + 0.6999999999999993, + 2.09 ], "texture": "#white" }, @@ -780,8 +1567,8 @@ "uv": [ 0, 0, - 0.8000000000000007, - 2.5 + 0.6999999999999993, + 2.09 ], "texture": "#white" }, @@ -789,8 +1576,8 @@ "uv": [ 0, 0, - 6.0, - 2.5 + 5.0, + 2.09 ], "texture": "#white" }, @@ -798,8 +1585,8 @@ "uv": [ 0, 0, - 6.0, - 2.5 + 5.0, + 2.09 ], "texture": "#white" }, @@ -807,8 +1594,8 @@ "uv": [ 0, 0, - 0.8000000000000007, - 6.0 + 0.6999999999999993, + 5.0 ], "texture": "#white" }, @@ -816,8 +1603,8 @@ "uv": [ 0, 0, - 0.8000000000000007, - 6.0 + 0.6999999999999993, + 5.0 ], "texture": "#white" } @@ -825,69 +1612,205 @@ }, { "from": [ - 7.0, - 7.0, - 26.0 + 7.65, + 2.67, + 21.5 ], "to": [ - 9.0, - 9.0, - 28.0 + 8.35, + 4.38, + 24.0 ], "faces": { "north": { "uv": [ 0, 0, - 2.0, - 2.0 + 0.6999999999999993, + 1.71 ], - "texture": "#nozzle" + "texture": "#white" }, "south": { "uv": [ 0, 0, - 2.0, - 2.0 + 0.6999999999999993, + 1.71 ], - "texture": "#nozzle" + "texture": "#white" }, "east": { "uv": [ 0, 0, - 2.0, - 2.0 + 2.5, + 1.71 ], - "texture": "#nozzle" + "texture": "#white" }, "west": { "uv": [ 0, 0, - 2.0, - 2.0 + 2.5, + 1.71 ], - "texture": "#nozzle" + "texture": "#white" }, "up": { "uv": [ 0, 0, - 2.0, - 2.0 + 0.6999999999999993, + 2.5 ], - "texture": "#nozzle" + "texture": "#white" }, "down": { "uv": [ 0, 0, - 2.0, - 2.0 + 0.6999999999999993, + 2.5 ], - "texture": "#nozzle" + "texture": "#white" + } + } + }, + { + "from": [ + 6.64, + 6.64, + 24.0 + ], + "to": [ + 9.36, + 9.36, + 25.6 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 2.7199999999999998, + 2.7199999999999998 + ], + "texture": "#bare_nozzle" + }, + "south": { + "uv": [ + 0, + 0, + 2.7199999999999998, + 2.7199999999999998 + ], + "texture": "#bare_nozzle" + }, + "east": { + "uv": [ + 0, + 0, + 1.6000000000000014, + 2.7199999999999998 + ], + "texture": "#bare_nozzle" + }, + "west": { + "uv": [ + 0, + 0, + 1.6000000000000014, + 2.7199999999999998 + ], + "texture": "#bare_nozzle" + }, + "up": { + "uv": [ + 0, + 0, + 2.7199999999999998, + 1.6000000000000014 + ], + "texture": "#bare_nozzle" + }, + "down": { + "uv": [ + 0, + 0, + 2.7199999999999998, + 1.6000000000000014 + ], + "texture": "#bare_nozzle" + } + } + }, + { + "from": [ + 7.0649999999999995, + 7.0649999999999995, + 25.6 + ], + "to": [ + 8.935, + 8.935, + 25.9 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 1.870000000000001, + 1.870000000000001 + ], + "texture": "#glow_ember" + }, + "south": { + "uv": [ + 0, + 0, + 1.870000000000001, + 1.870000000000001 + ], + "texture": "#glow_ember" + }, + "east": { + "uv": [ + 0, + 0, + 0.29999999999999716, + 1.870000000000001 + ], + "texture": "#glow_ember" + }, + "west": { + "uv": [ + 0, + 0, + 0.29999999999999716, + 1.870000000000001 + ], + "texture": "#glow_ember" + }, + "up": { + "uv": [ + 0, + 0, + 1.870000000000001, + 0.29999999999999716 + ], + "texture": "#glow_ember" + }, + "down": { + "uv": [ + 0, + 0, + 1.870000000000001, + 0.29999999999999716 + ], + "texture": "#glow_ember" } } } diff --git a/airdef-mod/assets/airdef/models/block/buk_chassis.json b/airdef-mod/assets/airdef/models/block/buk_chassis.json index 782529a..d19fa97 100644 --- a/airdef-mod/assets/airdef/models/block/buk_chassis.json +++ b/airdef-mod/assets/airdef/models/block/buk_chassis.json @@ -1,10 +1,17 @@ { "ambientocclusion": false, "textures": { + "ru_green_s21": "airdef:block/ru_green_s21", + "ru_green_s31": "airdef:block/ru_green_s31", + "ru_green_s23": "airdef:block/ru_green_s23", "ru_green": "airdef:block/ru_green", "dark_metal": "airdef:block/dark_metal", + "bare_nozzle": "airdef:block/bare_nozzle", "track": "airdef:block/track", - "particle": "airdef:block/ru_green" + "track_side_s31": "airdef:block/track_side_s31", + "ru_green_s13": "airdef:block/ru_green_s13", + "bare_lamp": "airdef:block/bare_lamp", + "particle": "airdef:block/ru_green_s21" }, "elements": [ { @@ -26,7 +33,7 @@ 16, 11.0 ], - "texture": "#ru_green" + "texture": "#ru_green_s21" }, "south": { "uv": [ @@ -35,7 +42,7 @@ 16, 11.0 ], - "texture": "#ru_green" + "texture": "#ru_green_s21" }, "east": { "uv": [ @@ -44,7 +51,7 @@ 16, 11.0 ], - "texture": "#ru_green" + "texture": "#ru_green_s31" }, "west": { "uv": [ @@ -53,7 +60,7 @@ 16, 11.0 ], - "texture": "#ru_green" + "texture": "#ru_green_s31" }, "up": { "uv": [ @@ -62,7 +69,7 @@ 16, 16 ], - "texture": "#ru_green" + "texture": "#ru_green_s23" }, "down": { "uv": [ @@ -71,7 +78,7 @@ 16, 16 ], - "texture": "#ru_green" + "texture": "#ru_green_s23" } } }, @@ -94,7 +101,7 @@ 16, 6.0 ], - "texture": "#ru_green" + "texture": "#ru_green_s21" }, "south": { "uv": [ @@ -103,7 +110,7 @@ 16, 6.0 ], - "texture": "#ru_green" + "texture": "#ru_green_s21" }, "east": { "uv": [ @@ -130,7 +137,7 @@ 16, 2.0 ], - "texture": "#ru_green" + "texture": "#ru_green_s21" }, "down": { "uv": [ @@ -139,10 +146,87 @@ 16, 2.0 ], - "texture": "#ru_green" + "texture": "#ru_green_s21" } } }, + { + "from": [ + -9.0, + 10.0, + -15.0 + ], + "to": [ + 25.0, + 14.0, + -12.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#ru_green_s21" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#ru_green_s21" + }, + "east": { + "uv": [ + 0, + 0, + 3.0, + 4.0 + ], + "texture": "#ru_green" + }, + "west": { + "uv": [ + 0, + 0, + 3.0, + 4.0 + ], + "texture": "#ru_green" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 3.0 + ], + "texture": "#ru_green_s21" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 3.0 + ], + "texture": "#ru_green_s21" + } + }, + "rotation": { + "angle": -22.5, + "axis": "x", + "origin": [ + 8.0, + 12.0, + -13.5 + ] + } + }, { "from": [ -8.0, @@ -211,6 +295,142 @@ } } }, + { + "from": [ + -5.0, + 15.2, + 24.0 + ], + "to": [ + 21.0, + 15.8, + 31.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 0.6000000000000014 + ], + "texture": "#bare_nozzle" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 0.6000000000000014 + ], + "texture": "#bare_nozzle" + }, + "east": { + "uv": [ + 0, + 0, + 7.0, + 0.6000000000000014 + ], + "texture": "#bare_nozzle" + }, + "west": { + "uv": [ + 0, + 0, + 7.0, + 0.6000000000000014 + ], + "texture": "#bare_nozzle" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 7.0 + ], + "texture": "#bare_nozzle" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 7.0 + ], + "texture": "#bare_nozzle" + } + } + }, + { + "from": [ + -1.0, + 15.0, + -10.0 + ], + "to": [ + 9.0, + 16.0, + -4.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 10.0, + 1.0 + ], + "texture": "#dark_metal" + }, + "south": { + "uv": [ + 0, + 0, + 10.0, + 1.0 + ], + "texture": "#dark_metal" + }, + "east": { + "uv": [ + 0, + 0, + 6.0, + 1.0 + ], + "texture": "#dark_metal" + }, + "west": { + "uv": [ + 0, + 0, + 6.0, + 1.0 + ], + "texture": "#dark_metal" + }, + "up": { + "uv": [ + 0, + 0, + 10.0, + 6.0 + ], + "texture": "#dark_metal" + }, + "down": { + "uv": [ + 0, + 0, + 10.0, + 6.0 + ], + "texture": "#dark_metal" + } + } + }, { "from": [ -14.0, @@ -248,7 +468,7 @@ 16, 9.0 ], - "texture": "#track" + "texture": "#track_side_s31" }, "west": { "uv": [ @@ -257,7 +477,7 @@ 16, 9.0 ], - "texture": "#track" + "texture": "#track_side_s31" }, "up": { "uv": [ @@ -316,7 +536,7 @@ 16, 9.0 ], - "texture": "#track" + "texture": "#track_side_s31" }, "west": { "uv": [ @@ -325,7 +545,7 @@ 16, 9.0 ], - "texture": "#track" + "texture": "#track_side_s31" }, "up": { "uv": [ @@ -384,7 +604,7 @@ 16, 5.0 ], - "texture": "#ru_green" + "texture": "#ru_green_s31" }, "west": { "uv": [ @@ -393,7 +613,7 @@ 16, 5.0 ], - "texture": "#ru_green" + "texture": "#ru_green_s31" }, "up": { "uv": [ @@ -402,7 +622,7 @@ 4.5, 16 ], - "texture": "#ru_green" + "texture": "#ru_green_s13" }, "down": { "uv": [ @@ -411,7 +631,7 @@ 4.5, 16 ], - "texture": "#ru_green" + "texture": "#ru_green_s13" } } }, @@ -452,7 +672,7 @@ 16, 5.0 ], - "texture": "#ru_green" + "texture": "#ru_green_s31" }, "west": { "uv": [ @@ -461,7 +681,7 @@ 16, 5.0 ], - "texture": "#ru_green" + "texture": "#ru_green_s31" }, "up": { "uv": [ @@ -470,7 +690,7 @@ 4.5, 16 ], - "texture": "#ru_green" + "texture": "#ru_green_s13" }, "down": { "uv": [ @@ -479,7 +699,143 @@ 4.5, 16 ], - "texture": "#ru_green" + "texture": "#ru_green_s13" + } + } + }, + { + "from": [ + -4.0, + 11.0, + -16.0 + ], + "to": [ + -1.0, + 13.0, + -15.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.0, + 2.0 + ], + "texture": "#bare_lamp" + }, + "south": { + "uv": [ + 0, + 0, + 3.0, + 2.0 + ], + "texture": "#bare_lamp" + }, + "east": { + "uv": [ + 0, + 0, + 1.0, + 2.0 + ], + "texture": "#bare_lamp" + }, + "west": { + "uv": [ + 0, + 0, + 1.0, + 2.0 + ], + "texture": "#bare_lamp" + }, + "up": { + "uv": [ + 0, + 0, + 3.0, + 1.0 + ], + "texture": "#bare_lamp" + }, + "down": { + "uv": [ + 0, + 0, + 3.0, + 1.0 + ], + "texture": "#bare_lamp" + } + } + }, + { + "from": [ + 17.0, + 11.0, + -16.0 + ], + "to": [ + 20.0, + 13.0, + -15.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.0, + 2.0 + ], + "texture": "#bare_lamp" + }, + "south": { + "uv": [ + 0, + 0, + 3.0, + 2.0 + ], + "texture": "#bare_lamp" + }, + "east": { + "uv": [ + 0, + 0, + 1.0, + 2.0 + ], + "texture": "#bare_lamp" + }, + "west": { + "uv": [ + 0, + 0, + 1.0, + 2.0 + ], + "texture": "#bare_lamp" + }, + "up": { + "uv": [ + 0, + 0, + 3.0, + 1.0 + ], + "texture": "#bare_lamp" + }, + "down": { + "uv": [ + 0, + 0, + 3.0, + 1.0 + ], + "texture": "#bare_lamp" } } } diff --git a/airdef-mod/assets/airdef/models/block/buk_chassis_burnt.json b/airdef-mod/assets/airdef/models/block/buk_chassis_burnt.json new file mode 100644 index 0000000..d32f71e --- /dev/null +++ b/airdef-mod/assets/airdef/models/block/buk_chassis_burnt.json @@ -0,0 +1,843 @@ +{ + "ambientocclusion": false, + "textures": { + "ru_green_s21_b": "airdef:block/ru_green_s21_b", + "ru_green_s31_b": "airdef:block/ru_green_s31_b", + "ru_green_s23_b": "airdef:block/ru_green_s23_b", + "ru_green_b": "airdef:block/ru_green_b", + "dark_metal_b": "airdef:block/dark_metal_b", + "bare_nozzle_b": "airdef:block/bare_nozzle_b", + "track_b": "airdef:block/track_b", + "track_side_s31_b": "airdef:block/track_side_s31_b", + "ru_green_s13_b": "airdef:block/ru_green_s13_b", + "bare_lamp_b": "airdef:block/bare_lamp_b", + "particle": "airdef:block/ru_green_s21_b" + }, + "elements": [ + { + "from": [ + -10.0, + 4.0, + -14.0 + ], + "to": [ + 26.0, + 15.0, + 32.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 11.0 + ], + "texture": "#ru_green_s21_b" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 11.0 + ], + "texture": "#ru_green_s21_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 11.0 + ], + "texture": "#ru_green_s31_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 11.0 + ], + "texture": "#ru_green_s31_b" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#ru_green_s23_b" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#ru_green_s23_b" + } + } + }, + { + "from": [ + -10.0, + 4.0, + -16.0 + ], + "to": [ + 26.0, + 10.0, + -14.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 6.0 + ], + "texture": "#ru_green_s21_b" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 6.0 + ], + "texture": "#ru_green_s21_b" + }, + "east": { + "uv": [ + 0, + 0, + 2.0, + 6.0 + ], + "texture": "#ru_green_b" + }, + "west": { + "uv": [ + 0, + 0, + 2.0, + 6.0 + ], + "texture": "#ru_green_b" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 2.0 + ], + "texture": "#ru_green_s21_b" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 2.0 + ], + "texture": "#ru_green_s21_b" + } + } + }, + { + "from": [ + -9.0, + 10.0, + -15.0 + ], + "to": [ + 25.0, + 14.0, + -12.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#ru_green_s21_b" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#ru_green_s21_b" + }, + "east": { + "uv": [ + 0, + 0, + 3.0, + 4.0 + ], + "texture": "#ru_green_b" + }, + "west": { + "uv": [ + 0, + 0, + 3.0, + 4.0 + ], + "texture": "#ru_green_b" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 3.0 + ], + "texture": "#ru_green_s21_b" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 3.0 + ], + "texture": "#ru_green_s21_b" + } + }, + "rotation": { + "angle": -22.5, + "axis": "x", + "origin": [ + 8.0, + 12.0, + -13.5 + ] + } + }, + { + "from": [ + -8.0, + 15.0, + 22.0 + ], + "to": [ + 24.0, + 16.0, + 32.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 1.0 + ], + "texture": "#dark_metal_b" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 1.0 + ], + "texture": "#dark_metal_b" + }, + "east": { + "uv": [ + 0, + 0, + 10.0, + 1.0 + ], + "texture": "#dark_metal_b" + }, + "west": { + "uv": [ + 0, + 0, + 10.0, + 1.0 + ], + "texture": "#dark_metal_b" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 10.0 + ], + "texture": "#dark_metal_b" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 10.0 + ], + "texture": "#dark_metal_b" + } + } + }, + { + "from": [ + -5.0, + 15.2, + 24.0 + ], + "to": [ + 21.0, + 15.8, + 31.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 0.6000000000000014 + ], + "texture": "#bare_nozzle_b" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 0.6000000000000014 + ], + "texture": "#bare_nozzle_b" + }, + "east": { + "uv": [ + 0, + 0, + 7.0, + 0.6000000000000014 + ], + "texture": "#bare_nozzle_b" + }, + "west": { + "uv": [ + 0, + 0, + 7.0, + 0.6000000000000014 + ], + "texture": "#bare_nozzle_b" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 7.0 + ], + "texture": "#bare_nozzle_b" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 7.0 + ], + "texture": "#bare_nozzle_b" + } + } + }, + { + "from": [ + -1.0, + 15.0, + -10.0 + ], + "to": [ + 9.0, + 16.0, + -4.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 10.0, + 1.0 + ], + "texture": "#dark_metal_b" + }, + "south": { + "uv": [ + 0, + 0, + 10.0, + 1.0 + ], + "texture": "#dark_metal_b" + }, + "east": { + "uv": [ + 0, + 0, + 6.0, + 1.0 + ], + "texture": "#dark_metal_b" + }, + "west": { + "uv": [ + 0, + 0, + 6.0, + 1.0 + ], + "texture": "#dark_metal_b" + }, + "up": { + "uv": [ + 0, + 0, + 10.0, + 6.0 + ], + "texture": "#dark_metal_b" + }, + "down": { + "uv": [ + 0, + 0, + 10.0, + 6.0 + ], + "texture": "#dark_metal_b" + } + } + }, + { + "from": [ + -14.0, + 0.0, + -15.0 + ], + "to": [ + -10.0, + 9.0, + 31.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 4.0, + 9.0 + ], + "texture": "#track_b" + }, + "south": { + "uv": [ + 0, + 0, + 4.0, + 9.0 + ], + "texture": "#track_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 9.0 + ], + "texture": "#track_side_s31_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 9.0 + ], + "texture": "#track_side_s31_b" + }, + "up": { + "uv": [ + 0, + 0, + 4.0, + 16 + ], + "texture": "#track_b" + }, + "down": { + "uv": [ + 0, + 0, + 4.0, + 16 + ], + "texture": "#track_b" + } + } + }, + { + "from": [ + 26.0, + 0.0, + -15.0 + ], + "to": [ + 30.0, + 9.0, + 31.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 4.0, + 9.0 + ], + "texture": "#track_b" + }, + "south": { + "uv": [ + 0, + 0, + 4.0, + 9.0 + ], + "texture": "#track_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 9.0 + ], + "texture": "#track_side_s31_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 9.0 + ], + "texture": "#track_side_s31_b" + }, + "up": { + "uv": [ + 0, + 0, + 4.0, + 16 + ], + "texture": "#track_b" + }, + "down": { + "uv": [ + 0, + 0, + 4.0, + 16 + ], + "texture": "#track_b" + } + } + }, + { + "from": [ + -14.5, + 5.0, + -15.0 + ], + "to": [ + -10.0, + 10.0, + 31.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 4.5, + 5.0 + ], + "texture": "#ru_green_b" + }, + "south": { + "uv": [ + 0, + 0, + 4.5, + 5.0 + ], + "texture": "#ru_green_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 5.0 + ], + "texture": "#ru_green_s31_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 5.0 + ], + "texture": "#ru_green_s31_b" + }, + "up": { + "uv": [ + 0, + 0, + 4.5, + 16 + ], + "texture": "#ru_green_s13_b" + }, + "down": { + "uv": [ + 0, + 0, + 4.5, + 16 + ], + "texture": "#ru_green_s13_b" + } + } + }, + { + "from": [ + 26.0, + 5.0, + -15.0 + ], + "to": [ + 30.5, + 10.0, + 31.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 4.5, + 5.0 + ], + "texture": "#ru_green_b" + }, + "south": { + "uv": [ + 0, + 0, + 4.5, + 5.0 + ], + "texture": "#ru_green_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 5.0 + ], + "texture": "#ru_green_s31_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 5.0 + ], + "texture": "#ru_green_s31_b" + }, + "up": { + "uv": [ + 0, + 0, + 4.5, + 16 + ], + "texture": "#ru_green_s13_b" + }, + "down": { + "uv": [ + 0, + 0, + 4.5, + 16 + ], + "texture": "#ru_green_s13_b" + } + } + }, + { + "from": [ + -4.0, + 11.0, + -16.0 + ], + "to": [ + -1.0, + 13.0, + -15.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.0, + 2.0 + ], + "texture": "#bare_lamp_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.0, + 2.0 + ], + "texture": "#bare_lamp_b" + }, + "east": { + "uv": [ + 0, + 0, + 1.0, + 2.0 + ], + "texture": "#bare_lamp_b" + }, + "west": { + "uv": [ + 0, + 0, + 1.0, + 2.0 + ], + "texture": "#bare_lamp_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.0, + 1.0 + ], + "texture": "#bare_lamp_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.0, + 1.0 + ], + "texture": "#bare_lamp_b" + } + } + }, + { + "from": [ + 17.0, + 11.0, + -16.0 + ], + "to": [ + 20.0, + 13.0, + -15.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.0, + 2.0 + ], + "texture": "#bare_lamp_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.0, + 2.0 + ], + "texture": "#bare_lamp_b" + }, + "east": { + "uv": [ + 0, + 0, + 1.0, + 2.0 + ], + "texture": "#bare_lamp_b" + }, + "west": { + "uv": [ + 0, + 0, + 1.0, + 2.0 + ], + "texture": "#bare_lamp_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.0, + 1.0 + ], + "texture": "#bare_lamp_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.0, + 1.0 + ], + "texture": "#bare_lamp_b" + } + } + } + ] +} \ No newline at end of file diff --git a/airdef-mod/assets/airdef/models/block/buk_rails.json b/airdef-mod/assets/airdef/models/block/buk_rails.json index 9460036..a5c717b 100644 --- a/airdef-mod/assets/airdef/models/block/buk_rails.json +++ b/airdef-mod/assets/airdef/models/block/buk_rails.json @@ -4,6 +4,7 @@ "missile_ru": "airdef:block/missile_ru", "booster": "airdef:block/booster", "dark_metal": "airdef:block/dark_metal", + "ru_green_s31": "airdef:block/ru_green_s31", "ru_green": "airdef:block/ru_green", "particle": "airdef:block/missile_ru" }, @@ -843,7 +844,7 @@ 16, 2.0 ], - "texture": "#ru_green" + "texture": "#ru_green_s31" }, "south": { "uv": [ @@ -852,7 +853,7 @@ 16, 2.0 ], - "texture": "#ru_green" + "texture": "#ru_green_s31" }, "east": { "uv": [ @@ -879,7 +880,7 @@ 16, 16 ], - "texture": "#ru_green" + "texture": "#ru_green_s31" }, "down": { "uv": [ @@ -888,7 +889,7 @@ 16, 16 ], - "texture": "#ru_green" + "texture": "#ru_green_s31" } } } diff --git a/airdef-mod/assets/airdef/models/block/buk_rails_burnt.json b/airdef-mod/assets/airdef/models/block/buk_rails_burnt.json new file mode 100644 index 0000000..a5311a8 --- /dev/null +++ b/airdef-mod/assets/airdef/models/block/buk_rails_burnt.json @@ -0,0 +1,897 @@ +{ + "ambientocclusion": false, + "textures": { + "missile_ru_b": "airdef:block/missile_ru_b", + "booster_b": "airdef:block/booster_b", + "dark_metal_b": "airdef:block/dark_metal_b", + "ru_green_s31_b": "airdef:block/ru_green_s31_b", + "ru_green_b": "airdef:block/ru_green_b", + "particle": "airdef:block/missile_ru_b" + }, + "elements": [ + { + "from": [ + -10.5, + 4.0, + -16.0 + ], + "to": [ + -7.5, + 7.0, + 26.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.0, + 3.0 + ], + "texture": "#missile_ru_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.0, + 3.0 + ], + "texture": "#missile_ru_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 3.0 + ], + "texture": "#missile_ru_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 3.0 + ], + "texture": "#missile_ru_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.0, + 16 + ], + "texture": "#missile_ru_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.0, + 16 + ], + "texture": "#missile_ru_b" + } + } + }, + { + "from": [ + -10.8, + 3.5, + 20.0 + ], + "to": [ + -7.2, + 7.5, + 27.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.6000000000000005, + 4.0 + ], + "texture": "#booster_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.6000000000000005, + 4.0 + ], + "texture": "#booster_b" + }, + "east": { + "uv": [ + 0, + 0, + 7.0, + 4.0 + ], + "texture": "#booster_b" + }, + "west": { + "uv": [ + 0, + 0, + 7.0, + 4.0 + ], + "texture": "#booster_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.6000000000000005, + 7.0 + ], + "texture": "#booster_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.6000000000000005, + 7.0 + ], + "texture": "#booster_b" + } + } + }, + { + "from": [ + -9.5, + 2.0, + -6.0 + ], + "to": [ + -8.5, + 4.0, + 16.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 1.0, + 2.0 + ], + "texture": "#dark_metal_b" + }, + "south": { + "uv": [ + 0, + 0, + 1.0, + 2.0 + ], + "texture": "#dark_metal_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 2.0 + ], + "texture": "#dark_metal_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 2.0 + ], + "texture": "#dark_metal_b" + }, + "up": { + "uv": [ + 0, + 0, + 1.0, + 16 + ], + "texture": "#dark_metal_b" + }, + "down": { + "uv": [ + 0, + 0, + 1.0, + 16 + ], + "texture": "#dark_metal_b" + } + } + }, + { + "from": [ + -4.5, + 4.0, + -16.0 + ], + "to": [ + -1.5, + 7.0, + 26.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.0, + 3.0 + ], + "texture": "#missile_ru_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.0, + 3.0 + ], + "texture": "#missile_ru_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 3.0 + ], + "texture": "#missile_ru_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 3.0 + ], + "texture": "#missile_ru_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.0, + 16 + ], + "texture": "#missile_ru_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.0, + 16 + ], + "texture": "#missile_ru_b" + } + } + }, + { + "from": [ + -4.8, + 3.5, + 20.0 + ], + "to": [ + -1.2, + 7.5, + 27.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.5999999999999996, + 4.0 + ], + "texture": "#booster_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.5999999999999996, + 4.0 + ], + "texture": "#booster_b" + }, + "east": { + "uv": [ + 0, + 0, + 7.0, + 4.0 + ], + "texture": "#booster_b" + }, + "west": { + "uv": [ + 0, + 0, + 7.0, + 4.0 + ], + "texture": "#booster_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.5999999999999996, + 7.0 + ], + "texture": "#booster_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.5999999999999996, + 7.0 + ], + "texture": "#booster_b" + } + } + }, + { + "from": [ + -3.5, + 2.0, + -6.0 + ], + "to": [ + -2.5, + 4.0, + 16.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 1.0, + 2.0 + ], + "texture": "#dark_metal_b" + }, + "south": { + "uv": [ + 0, + 0, + 1.0, + 2.0 + ], + "texture": "#dark_metal_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 2.0 + ], + "texture": "#dark_metal_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 2.0 + ], + "texture": "#dark_metal_b" + }, + "up": { + "uv": [ + 0, + 0, + 1.0, + 16 + ], + "texture": "#dark_metal_b" + }, + "down": { + "uv": [ + 0, + 0, + 1.0, + 16 + ], + "texture": "#dark_metal_b" + } + } + }, + { + "from": [ + 11.5, + 4.0, + -16.0 + ], + "to": [ + 14.5, + 7.0, + 26.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.0, + 3.0 + ], + "texture": "#missile_ru_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.0, + 3.0 + ], + "texture": "#missile_ru_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 3.0 + ], + "texture": "#missile_ru_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 3.0 + ], + "texture": "#missile_ru_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.0, + 16 + ], + "texture": "#missile_ru_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.0, + 16 + ], + "texture": "#missile_ru_b" + } + } + }, + { + "from": [ + 11.2, + 3.5, + 20.0 + ], + "to": [ + 14.8, + 7.5, + 27.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.6000000000000014, + 4.0 + ], + "texture": "#booster_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.6000000000000014, + 4.0 + ], + "texture": "#booster_b" + }, + "east": { + "uv": [ + 0, + 0, + 7.0, + 4.0 + ], + "texture": "#booster_b" + }, + "west": { + "uv": [ + 0, + 0, + 7.0, + 4.0 + ], + "texture": "#booster_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.6000000000000014, + 7.0 + ], + "texture": "#booster_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.6000000000000014, + 7.0 + ], + "texture": "#booster_b" + } + } + }, + { + "from": [ + 12.5, + 2.0, + -6.0 + ], + "to": [ + 13.5, + 4.0, + 16.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 1.0, + 2.0 + ], + "texture": "#dark_metal_b" + }, + "south": { + "uv": [ + 0, + 0, + 1.0, + 2.0 + ], + "texture": "#dark_metal_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 2.0 + ], + "texture": "#dark_metal_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 2.0 + ], + "texture": "#dark_metal_b" + }, + "up": { + "uv": [ + 0, + 0, + 1.0, + 16 + ], + "texture": "#dark_metal_b" + }, + "down": { + "uv": [ + 0, + 0, + 1.0, + 16 + ], + "texture": "#dark_metal_b" + } + } + }, + { + "from": [ + 17.5, + 4.0, + -16.0 + ], + "to": [ + 20.5, + 7.0, + 26.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.0, + 3.0 + ], + "texture": "#missile_ru_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.0, + 3.0 + ], + "texture": "#missile_ru_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 3.0 + ], + "texture": "#missile_ru_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 3.0 + ], + "texture": "#missile_ru_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.0, + 16 + ], + "texture": "#missile_ru_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.0, + 16 + ], + "texture": "#missile_ru_b" + } + } + }, + { + "from": [ + 17.2, + 3.5, + 20.0 + ], + "to": [ + 20.8, + 7.5, + 27.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.6000000000000014, + 4.0 + ], + "texture": "#booster_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.6000000000000014, + 4.0 + ], + "texture": "#booster_b" + }, + "east": { + "uv": [ + 0, + 0, + 7.0, + 4.0 + ], + "texture": "#booster_b" + }, + "west": { + "uv": [ + 0, + 0, + 7.0, + 4.0 + ], + "texture": "#booster_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.6000000000000014, + 7.0 + ], + "texture": "#booster_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.6000000000000014, + 7.0 + ], + "texture": "#booster_b" + } + } + }, + { + "from": [ + 18.5, + 2.0, + -6.0 + ], + "to": [ + 19.5, + 4.0, + 16.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 1.0, + 2.0 + ], + "texture": "#dark_metal_b" + }, + "south": { + "uv": [ + 0, + 0, + 1.0, + 2.0 + ], + "texture": "#dark_metal_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 2.0 + ], + "texture": "#dark_metal_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 2.0 + ], + "texture": "#dark_metal_b" + }, + "up": { + "uv": [ + 0, + 0, + 1.0, + 16 + ], + "texture": "#dark_metal_b" + }, + "down": { + "uv": [ + 0, + 0, + 1.0, + 16 + ], + "texture": "#dark_metal_b" + } + } + }, + { + "from": [ + -12.0, + 0.0, + -2.0 + ], + "to": [ + 28.0, + 2.0, + 14.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 2.0 + ], + "texture": "#ru_green_s31_b" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 2.0 + ], + "texture": "#ru_green_s31_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 2.0 + ], + "texture": "#ru_green_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 2.0 + ], + "texture": "#ru_green_b" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#ru_green_s31_b" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#ru_green_s31_b" + } + } + } + ] +} \ No newline at end of file diff --git a/airdef-mod/assets/airdef/models/block/buk_turret.json b/airdef-mod/assets/airdef/models/block/buk_turret.json index 899dc57..2431d96 100644 --- a/airdef-mod/assets/airdef/models/block/buk_turret.json +++ b/airdef-mod/assets/airdef/models/block/buk_turret.json @@ -1,9 +1,11 @@ { "ambientocclusion": false, "textures": { - "ru_green": "airdef:block/ru_green", + "ru_green_s21": "airdef:block/ru_green_s21", + "ru_green_s22": "airdef:block/ru_green_s22", "radar_face": "airdef:block/radar_face", - "particle": "airdef:block/ru_green" + "ru_green": "airdef:block/ru_green", + "particle": "airdef:block/ru_green_s21" }, "elements": [ { @@ -25,7 +27,7 @@ 16, 9.0 ], - "texture": "#ru_green" + "texture": "#ru_green_s21" }, "south": { "uv": [ @@ -34,7 +36,7 @@ 16, 9.0 ], - "texture": "#ru_green" + "texture": "#ru_green_s21" }, "east": { "uv": [ @@ -43,7 +45,7 @@ 16, 9.0 ], - "texture": "#ru_green" + "texture": "#ru_green_s21" }, "west": { "uv": [ @@ -52,7 +54,7 @@ 16, 9.0 ], - "texture": "#ru_green" + "texture": "#ru_green_s21" }, "up": { "uv": [ @@ -61,7 +63,7 @@ 16, 16 ], - "texture": "#ru_green" + "texture": "#ru_green_s22" }, "down": { "uv": [ @@ -70,7 +72,7 @@ 16, 16 ], - "texture": "#ru_green" + "texture": "#ru_green_s22" } } }, diff --git a/airdef-mod/assets/airdef/models/block/buk_turret_burnt.json b/airdef-mod/assets/airdef/models/block/buk_turret_burnt.json new file mode 100644 index 0000000..521e5ff --- /dev/null +++ b/airdef-mod/assets/airdef/models/block/buk_turret_burnt.json @@ -0,0 +1,216 @@ +{ + "ambientocclusion": false, + "textures": { + "ru_green_s21_b": "airdef:block/ru_green_s21_b", + "ru_green_s22_b": "airdef:block/ru_green_s22_b", + "radar_face_b": "airdef:block/radar_face_b", + "ru_green_b": "airdef:block/ru_green_b", + "particle": "airdef:block/ru_green_s21_b" + }, + "elements": [ + { + "from": [ + -4.0, + 0.0, + -4.0 + ], + "to": [ + 20.0, + 9.0, + 20.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 9.0 + ], + "texture": "#ru_green_s21_b" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 9.0 + ], + "texture": "#ru_green_s21_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 9.0 + ], + "texture": "#ru_green_s21_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 9.0 + ], + "texture": "#ru_green_s21_b" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#ru_green_s22_b" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#ru_green_s22_b" + } + } + }, + { + "from": [ + 1.0, + 2.0, + -10.0 + ], + "to": [ + 15.0, + 14.0, + -4.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 14.0, + 12.0 + ], + "texture": "#radar_face_b" + }, + "south": { + "uv": [ + 0, + 0, + 14.0, + 12.0 + ], + "texture": "#radar_face_b" + }, + "east": { + "uv": [ + 0, + 0, + 6.0, + 12.0 + ], + "texture": "#radar_face_b" + }, + "west": { + "uv": [ + 0, + 0, + 6.0, + 12.0 + ], + "texture": "#radar_face_b" + }, + "up": { + "uv": [ + 0, + 0, + 14.0, + 6.0 + ], + "texture": "#radar_face_b" + }, + "down": { + "uv": [ + 0, + 0, + 14.0, + 6.0 + ], + "texture": "#radar_face_b" + } + } + }, + { + "from": [ + -2.0, + 9.0, + 6.0 + ], + "to": [ + 18.0, + 11.0, + 18.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 2.0 + ], + "texture": "#ru_green_b" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 2.0 + ], + "texture": "#ru_green_b" + }, + "east": { + "uv": [ + 0, + 0, + 12.0, + 2.0 + ], + "texture": "#ru_green_b" + }, + "west": { + "uv": [ + 0, + 0, + 12.0, + 2.0 + ], + "texture": "#ru_green_b" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 12.0 + ], + "texture": "#ru_green_b" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 12.0 + ], + "texture": "#ru_green_b" + } + } + } + ] +} \ No newline at end of file diff --git a/airdef-mod/assets/airdef/models/block/depot.json b/airdef-mod/assets/airdef/models/block/depot.json index 45fb40c..515d4fb 100644 --- a/airdef-mod/assets/airdef/models/block/depot.json +++ b/airdef-mod/assets/airdef/models/block/depot.json @@ -3,8 +3,8 @@ "textures": { "concrete": "airdef:block/concrete", "crate": "airdef:block/crate", - "tube": "airdef:block/tube", "tube_cap": "airdef:block/tube_cap", + "tube": "airdef:block/tube", "particle": "airdef:block/concrete" }, "elements": [ diff --git a/airdef-mod/assets/airdef/models/block/depot_burnt.json b/airdef-mod/assets/airdef/models/block/depot_burnt.json new file mode 100644 index 0000000..ba73159 --- /dev/null +++ b/airdef-mod/assets/airdef/models/block/depot_burnt.json @@ -0,0 +1,488 @@ +{ + "ambientocclusion": false, + "textures": { + "concrete_b": "airdef:block/concrete_b", + "crate_b": "airdef:block/crate_b", + "tube_cap_b": "airdef:block/tube_cap_b", + "tube_b": "airdef:block/tube_b", + "particle": "airdef:block/concrete_b" + }, + "elements": [ + { + "from": [ + -14.0, + 0.0, + -14.0 + ], + "to": [ + 30.0, + 2.0, + 30.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 2.0 + ], + "texture": "#concrete_b" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 2.0 + ], + "texture": "#concrete_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 2.0 + ], + "texture": "#concrete_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 2.0 + ], + "texture": "#concrete_b" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#concrete_b" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#concrete_b" + } + } + }, + { + "from": [ + -12.0, + 2.0, + -12.0 + ], + "to": [ + 0.0, + 10.0, + 0.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 12.0, + 8.0 + ], + "texture": "#crate_b" + }, + "south": { + "uv": [ + 0, + 0, + 12.0, + 8.0 + ], + "texture": "#crate_b" + }, + "east": { + "uv": [ + 0, + 0, + 12.0, + 8.0 + ], + "texture": "#crate_b" + }, + "west": { + "uv": [ + 0, + 0, + 12.0, + 8.0 + ], + "texture": "#crate_b" + }, + "up": { + "uv": [ + 0, + 0, + 12.0, + 12.0 + ], + "texture": "#crate_b" + }, + "down": { + "uv": [ + 0, + 0, + 12.0, + 12.0 + ], + "texture": "#crate_b" + } + } + }, + { + "from": [ + -12.0, + 2.0, + 4.0 + ], + "to": [ + 0.0, + 10.0, + 16.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 12.0, + 8.0 + ], + "texture": "#crate_b" + }, + "south": { + "uv": [ + 0, + 0, + 12.0, + 8.0 + ], + "texture": "#crate_b" + }, + "east": { + "uv": [ + 0, + 0, + 12.0, + 8.0 + ], + "texture": "#crate_b" + }, + "west": { + "uv": [ + 0, + 0, + 12.0, + 8.0 + ], + "texture": "#crate_b" + }, + "up": { + "uv": [ + 0, + 0, + 12.0, + 12.0 + ], + "texture": "#crate_b" + }, + "down": { + "uv": [ + 0, + 0, + 12.0, + 12.0 + ], + "texture": "#crate_b" + } + } + }, + { + "from": [ + 4.0, + 2.0, + -12.0 + ], + "to": [ + 16.0, + 10.0, + 0.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 12.0, + 8.0 + ], + "texture": "#crate_b" + }, + "south": { + "uv": [ + 0, + 0, + 12.0, + 8.0 + ], + "texture": "#crate_b" + }, + "east": { + "uv": [ + 0, + 0, + 12.0, + 8.0 + ], + "texture": "#crate_b" + }, + "west": { + "uv": [ + 0, + 0, + 12.0, + 8.0 + ], + "texture": "#crate_b" + }, + "up": { + "uv": [ + 0, + 0, + 12.0, + 12.0 + ], + "texture": "#crate_b" + }, + "down": { + "uv": [ + 0, + 0, + 12.0, + 12.0 + ], + "texture": "#crate_b" + } + } + }, + { + "from": [ + 6.0, + 2.0, + 6.0 + ], + "to": [ + 28.0, + 7.0, + 10.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 5.0 + ], + "texture": "#tube_cap_b" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 5.0 + ], + "texture": "#tube_cap_b" + }, + "east": { + "uv": [ + 0, + 0, + 4.0, + 5.0 + ], + "texture": "#tube_b" + }, + "west": { + "uv": [ + 0, + 0, + 4.0, + 5.0 + ], + "texture": "#tube_b" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#tube_b" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#tube_b" + } + } + }, + { + "from": [ + 6.0, + 7.0, + 6.0 + ], + "to": [ + 28.0, + 12.0, + 10.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 5.0 + ], + "texture": "#tube_cap_b" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 5.0 + ], + "texture": "#tube_cap_b" + }, + "east": { + "uv": [ + 0, + 0, + 4.0, + 5.0 + ], + "texture": "#tube_b" + }, + "west": { + "uv": [ + 0, + 0, + 4.0, + 5.0 + ], + "texture": "#tube_b" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#tube_b" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#tube_b" + } + } + }, + { + "from": [ + 6.0, + 12.0, + 6.0 + ], + "to": [ + 28.0, + 17.0, + 10.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 5.0 + ], + "texture": "#tube_cap_b" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 5.0 + ], + "texture": "#tube_cap_b" + }, + "east": { + "uv": [ + 0, + 0, + 4.0, + 5.0 + ], + "texture": "#tube_b" + }, + "west": { + "uv": [ + 0, + 0, + 4.0, + 5.0 + ], + "texture": "#tube_b" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#tube_b" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#tube_b" + } + } + } + ] +} \ No newline at end of file diff --git a/airdef-mod/assets/airdef/models/block/ew_truck.json b/airdef-mod/assets/airdef/models/block/ew_truck.json index 2f98565..53f9296 100644 --- a/airdef-mod/assets/airdef/models/block/ew_truck.json +++ b/airdef-mod/assets/airdef/models/block/ew_truck.json @@ -1,11 +1,16 @@ { "ambientocclusion": false, "textures": { + "ru_khaki_s21": "airdef:block/ru_khaki_s21", + "ru_khaki_s31": "airdef:block/ru_khaki_s31", + "ru_khaki_s23": "airdef:block/ru_khaki_s23", + "glass_cab": "airdef:block/glass_cab", "ru_khaki": "airdef:block/ru_khaki", - "glass": "airdef:block/glass", - "antenna": "airdef:block/antenna", + "ru_khaki_s22": "airdef:block/ru_khaki_s22", + "bare_antenna": "airdef:block/bare_antenna", "tire": "airdef:block/tire", - "particle": "airdef:block/ru_khaki" + "hub": "airdef:block/hub", + "particle": "airdef:block/ru_khaki_s21" }, "elements": [ { @@ -27,7 +32,7 @@ 16, 4.0 ], - "texture": "#ru_khaki" + "texture": "#ru_khaki_s21" }, "south": { "uv": [ @@ -36,7 +41,7 @@ 16, 4.0 ], - "texture": "#ru_khaki" + "texture": "#ru_khaki_s21" }, "east": { "uv": [ @@ -45,7 +50,7 @@ 16, 4.0 ], - "texture": "#ru_khaki" + "texture": "#ru_khaki_s31" }, "west": { "uv": [ @@ -54,7 +59,7 @@ 16, 4.0 ], - "texture": "#ru_khaki" + "texture": "#ru_khaki_s31" }, "up": { "uv": [ @@ -63,7 +68,7 @@ 16, 16 ], - "texture": "#ru_khaki" + "texture": "#ru_khaki_s23" }, "down": { "uv": [ @@ -72,7 +77,7 @@ 16, 16 ], - "texture": "#ru_khaki" + "texture": "#ru_khaki_s23" } } }, @@ -95,7 +100,7 @@ 16, 10.0 ], - "texture": "#glass" + "texture": "#glass_cab" }, "south": { "uv": [ @@ -104,7 +109,7 @@ 16, 10.0 ], - "texture": "#ru_khaki" + "texture": "#ru_khaki_s21" }, "east": { "uv": [ @@ -131,7 +136,7 @@ 16, 10.0 ], - "texture": "#ru_khaki" + "texture": "#ru_khaki_s21" }, "down": { "uv": [ @@ -140,7 +145,7 @@ 16, 10.0 ], - "texture": "#ru_khaki" + "texture": "#ru_khaki_s21" } } }, @@ -163,7 +168,7 @@ 16, 13.0 ], - "texture": "#ru_khaki" + "texture": "#ru_khaki_s21" }, "south": { "uv": [ @@ -172,7 +177,7 @@ 16, 13.0 ], - "texture": "#ru_khaki" + "texture": "#ru_khaki_s21" }, "east": { "uv": [ @@ -181,7 +186,7 @@ 16, 13.0 ], - "texture": "#ru_khaki" + "texture": "#ru_khaki_s21" }, "west": { "uv": [ @@ -190,7 +195,7 @@ 16, 13.0 ], - "texture": "#ru_khaki" + "texture": "#ru_khaki_s21" }, "up": { "uv": [ @@ -199,7 +204,7 @@ 16, 16 ], - "texture": "#ru_khaki" + "texture": "#ru_khaki_s22" }, "down": { "uv": [ @@ -208,7 +213,7 @@ 16, 16 ], - "texture": "#ru_khaki" + "texture": "#ru_khaki_s22" } } }, @@ -231,7 +236,7 @@ 2.0, 10.0 ], - "texture": "#antenna" + "texture": "#bare_antenna" }, "south": { "uv": [ @@ -240,7 +245,7 @@ 2.0, 10.0 ], - "texture": "#antenna" + "texture": "#bare_antenna" }, "east": { "uv": [ @@ -249,7 +254,7 @@ 2.0, 10.0 ], - "texture": "#antenna" + "texture": "#bare_antenna" }, "west": { "uv": [ @@ -258,7 +263,7 @@ 2.0, 10.0 ], - "texture": "#antenna" + "texture": "#bare_antenna" }, "up": { "uv": [ @@ -267,7 +272,7 @@ 2.0, 2.0 ], - "texture": "#antenna" + "texture": "#bare_antenna" }, "down": { "uv": [ @@ -276,7 +281,7 @@ 2.0, 2.0 ], - "texture": "#antenna" + "texture": "#bare_antenna" } } }, @@ -299,7 +304,7 @@ 11.0, 3.0 ], - "texture": "#antenna" + "texture": "#bare_antenna" }, "south": { "uv": [ @@ -308,7 +313,7 @@ 11.0, 3.0 ], - "texture": "#antenna" + "texture": "#bare_antenna" }, "east": { "uv": [ @@ -317,7 +322,7 @@ 4.0, 3.0 ], - "texture": "#antenna" + "texture": "#bare_antenna" }, "west": { "uv": [ @@ -326,7 +331,7 @@ 4.0, 3.0 ], - "texture": "#antenna" + "texture": "#bare_antenna" }, "up": { "uv": [ @@ -335,7 +340,7 @@ 11.0, 4.0 ], - "texture": "#antenna" + "texture": "#bare_antenna" }, "down": { "uv": [ @@ -344,7 +349,7 @@ 11.0, 4.0 ], - "texture": "#antenna" + "texture": "#bare_antenna" } } }, @@ -367,7 +372,7 @@ 11.0, 3.0 ], - "texture": "#antenna" + "texture": "#bare_antenna" }, "south": { "uv": [ @@ -376,7 +381,7 @@ 11.0, 3.0 ], - "texture": "#antenna" + "texture": "#bare_antenna" }, "east": { "uv": [ @@ -385,7 +390,7 @@ 4.0, 3.0 ], - "texture": "#antenna" + "texture": "#bare_antenna" }, "west": { "uv": [ @@ -394,7 +399,7 @@ 4.0, 3.0 ], - "texture": "#antenna" + "texture": "#bare_antenna" }, "up": { "uv": [ @@ -403,7 +408,7 @@ 11.0, 4.0 ], - "texture": "#antenna" + "texture": "#bare_antenna" }, "down": { "uv": [ @@ -412,7 +417,7 @@ 11.0, 4.0 ], - "texture": "#antenna" + "texture": "#bare_antenna" } } }, @@ -435,7 +440,7 @@ 11.0, 3.0 ], - "texture": "#antenna" + "texture": "#bare_antenna" }, "south": { "uv": [ @@ -444,7 +449,7 @@ 11.0, 3.0 ], - "texture": "#antenna" + "texture": "#bare_antenna" }, "east": { "uv": [ @@ -453,7 +458,7 @@ 4.0, 3.0 ], - "texture": "#antenna" + "texture": "#bare_antenna" }, "west": { "uv": [ @@ -462,7 +467,7 @@ 4.0, 3.0 ], - "texture": "#antenna" + "texture": "#bare_antenna" }, "up": { "uv": [ @@ -471,7 +476,7 @@ 11.0, 4.0 ], - "texture": "#antenna" + "texture": "#bare_antenna" }, "down": { "uv": [ @@ -480,7 +485,7 @@ 11.0, 4.0 ], - "texture": "#antenna" + "texture": "#bare_antenna" } } }, @@ -503,7 +508,7 @@ 11.0, 3.0 ], - "texture": "#antenna" + "texture": "#bare_antenna" }, "south": { "uv": [ @@ -512,7 +517,7 @@ 11.0, 3.0 ], - "texture": "#antenna" + "texture": "#bare_antenna" }, "east": { "uv": [ @@ -521,7 +526,7 @@ 4.0, 3.0 ], - "texture": "#antenna" + "texture": "#bare_antenna" }, "west": { "uv": [ @@ -530,7 +535,7 @@ 4.0, 3.0 ], - "texture": "#antenna" + "texture": "#bare_antenna" }, "up": { "uv": [ @@ -539,7 +544,7 @@ 11.0, 4.0 ], - "texture": "#antenna" + "texture": "#bare_antenna" }, "down": { "uv": [ @@ -548,20 +553,20 @@ 11.0, 4.0 ], - "texture": "#antenna" + "texture": "#bare_antenna" } } }, { "from": [ -9.0, - 0.0, - -12.0 + 0.3424499999999995, + -12.65755 ], "to": [ -5.5, - 9.0, - -5.0 + 8.65755, + -4.3424499999999995 ], "faces": { "north": { @@ -569,7 +574,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -578,7 +583,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -586,26 +591,26 @@ "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -614,7 +619,7 @@ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" } @@ -623,13 +628,13 @@ { "from": [ 21.5, - 0.0, - -12.0 + 0.3424499999999995, + -12.65755 ], "to": [ 25.0, - 9.0, - -5.0 + 8.65755, + -4.3424499999999995 ], "faces": { "north": { @@ -637,7 +642,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -646,7 +651,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -654,26 +659,26 @@ "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -682,22 +687,176 @@ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" } } }, + { + "from": [ + -8.97, + 0.3424499999999995, + -12.65755 + ], + "to": [ + -5.53, + 8.65755, + -4.3424499999999995 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -7.25, + 4.5, + -8.5 + ] + } + }, + { + "from": [ + 21.53, + 0.3424499999999995, + -12.65755 + ], + "to": [ + 24.97, + 8.65755, + -4.3424499999999995 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 23.25, + 4.5, + -8.5 + ] + } + }, { "from": [ -9.0, - 0.0, - -3.0 + 0.3424499999999995, + -3.6575500000000005 ], "to": [ -5.5, - 9.0, - 4.0 + 8.65755, + 4.6575500000000005 ], "faces": { "north": { @@ -705,7 +864,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -714,7 +873,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -722,26 +881,26 @@ "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -750,7 +909,7 @@ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" } @@ -759,13 +918,13 @@ { "from": [ 21.5, - 0.0, - -3.0 + 0.3424499999999995, + -3.6575500000000005 ], "to": [ 25.0, - 9.0, - 4.0 + 8.65755, + 4.6575500000000005 ], "faces": { "north": { @@ -773,7 +932,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -782,7 +941,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -790,26 +949,26 @@ "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -818,22 +977,176 @@ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" } } }, + { + "from": [ + -8.97, + 0.3424499999999995, + -3.6575500000000005 + ], + "to": [ + -5.53, + 8.65755, + 4.6575500000000005 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -7.25, + 4.5, + 0.5 + ] + } + }, + { + "from": [ + 21.53, + 0.3424499999999995, + -3.6575500000000005 + ], + "to": [ + 24.97, + 8.65755, + 4.6575500000000005 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 23.25, + 4.5, + 0.5 + ] + } + }, { "from": [ -9.0, - 0.0, - 16.0 + 0.3424499999999995, + 15.34245 ], "to": [ -5.5, - 9.0, - 23.0 + 8.65755, + 23.65755 ], "faces": { "north": { @@ -841,7 +1154,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -850,7 +1163,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -858,26 +1171,26 @@ "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -886,7 +1199,7 @@ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" } @@ -895,13 +1208,13 @@ { "from": [ 21.5, - 0.0, - 16.0 + 0.3424499999999995, + 15.34245 ], "to": [ 25.0, - 9.0, - 23.0 + 8.65755, + 23.65755 ], "faces": { "north": { @@ -909,7 +1222,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -918,7 +1231,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -926,26 +1239,26 @@ "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -954,22 +1267,176 @@ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" } } }, + { + "from": [ + -8.97, + 0.3424499999999995, + 15.34245 + ], + "to": [ + -5.53, + 8.65755, + 23.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -7.25, + 4.5, + 19.5 + ] + } + }, + { + "from": [ + 21.53, + 0.3424499999999995, + 15.34245 + ], + "to": [ + 24.97, + 8.65755, + 23.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 23.25, + 4.5, + 19.5 + ] + } + }, { "from": [ -9.0, - 0.0, - 24.0 + 0.3424499999999995, + 23.34245 ], "to": [ -5.5, - 9.0, - 31.0 + 8.65755, + 31.65755 ], "faces": { "north": { @@ -977,7 +1444,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -986,7 +1453,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -994,26 +1461,26 @@ "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -1022,7 +1489,7 @@ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" } @@ -1031,13 +1498,13 @@ { "from": [ 21.5, - 0.0, - 24.0 + 0.3424499999999995, + 23.34245 ], "to": [ 25.0, - 9.0, - 31.0 + 8.65755, + 31.65755 ], "faces": { "north": { @@ -1045,7 +1512,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -1054,7 +1521,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -1062,26 +1529,26 @@ "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -1090,11 +1557,165 @@ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" } } + }, + { + "from": [ + -8.97, + 0.3424499999999995, + 23.34245 + ], + "to": [ + -5.53, + 8.65755, + 31.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -7.25, + 4.5, + 27.5 + ] + } + }, + { + "from": [ + 21.53, + 0.3424499999999995, + 23.34245 + ], + "to": [ + 24.97, + 8.65755, + 31.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 23.25, + 4.5, + 27.5 + ] + } } ] } \ No newline at end of file diff --git a/airdef-mod/assets/airdef/models/block/ew_truck_burnt.json b/airdef-mod/assets/airdef/models/block/ew_truck_burnt.json new file mode 100644 index 0000000..123c91d --- /dev/null +++ b/airdef-mod/assets/airdef/models/block/ew_truck_burnt.json @@ -0,0 +1,1380 @@ +{ + "ambientocclusion": false, + "textures": { + "ru_khaki_s21_b": "airdef:block/ru_khaki_s21_b", + "ru_khaki_s31_b": "airdef:block/ru_khaki_s31_b", + "ru_khaki_s23_b": "airdef:block/ru_khaki_s23_b", + "glass_cab_b": "airdef:block/glass_cab_b", + "ru_khaki_b": "airdef:block/ru_khaki_b", + "ru_khaki_s22_b": "airdef:block/ru_khaki_s22_b", + "tire_b": "airdef:block/tire_b", + "hub_b": "airdef:block/hub_b", + "particle": "airdef:block/ru_khaki_s21_b" + }, + "elements": [ + { + "from": [ + -6.0, + 5.0, + -16.0 + ], + "to": [ + 22.0, + 9.0, + 32.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#ru_khaki_s21_b" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#ru_khaki_s21_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#ru_khaki_s31_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#ru_khaki_s31_b" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#ru_khaki_s23_b" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#ru_khaki_s23_b" + } + } + }, + { + "from": [ + -6.0, + 9.0, + -16.0 + ], + "to": [ + 22.0, + 19.0, + -6.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 10.0 + ], + "texture": "#glass_cab_b" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 10.0 + ], + "texture": "#ru_khaki_s21_b" + }, + "east": { + "uv": [ + 0, + 0, + 10.0, + 10.0 + ], + "texture": "#ru_khaki_b" + }, + "west": { + "uv": [ + 0, + 0, + 10.0, + 10.0 + ], + "texture": "#ru_khaki_b" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 10.0 + ], + "texture": "#ru_khaki_s21_b" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 10.0 + ], + "texture": "#ru_khaki_s21_b" + } + } + }, + { + "from": [ + -5.0, + 9.0, + -4.0 + ], + "to": [ + 21.0, + 22.0, + 30.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 13.0 + ], + "texture": "#ru_khaki_s21_b" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 13.0 + ], + "texture": "#ru_khaki_s21_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 13.0 + ], + "texture": "#ru_khaki_s21_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 13.0 + ], + "texture": "#ru_khaki_s21_b" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#ru_khaki_s22_b" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#ru_khaki_s22_b" + } + } + }, + { + "from": [ + -9.0, + 0.3424499999999995, + -12.65755 + ], + "to": [ + -5.5, + 8.65755, + -4.3424499999999995 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + } + } + }, + { + "from": [ + 21.5, + 0.3424499999999995, + -12.65755 + ], + "to": [ + 25.0, + 8.65755, + -4.3424499999999995 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + } + } + }, + { + "from": [ + -8.97, + 0.3424499999999995, + -12.65755 + ], + "to": [ + -5.53, + 8.65755, + -4.3424499999999995 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -7.25, + 4.5, + -8.5 + ] + } + }, + { + "from": [ + 21.53, + 0.3424499999999995, + -12.65755 + ], + "to": [ + 24.97, + 8.65755, + -4.3424499999999995 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 23.25, + 4.5, + -8.5 + ] + } + }, + { + "from": [ + -9.0, + 0.3424499999999995, + -3.6575500000000005 + ], + "to": [ + -5.5, + 8.65755, + 4.6575500000000005 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + } + } + }, + { + "from": [ + 21.5, + 0.3424499999999995, + -3.6575500000000005 + ], + "to": [ + 25.0, + 8.65755, + 4.6575500000000005 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + } + } + }, + { + "from": [ + -8.97, + 0.3424499999999995, + -3.6575500000000005 + ], + "to": [ + -5.53, + 8.65755, + 4.6575500000000005 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -7.25, + 4.5, + 0.5 + ] + } + }, + { + "from": [ + 21.53, + 0.3424499999999995, + -3.6575500000000005 + ], + "to": [ + 24.97, + 8.65755, + 4.6575500000000005 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 23.25, + 4.5, + 0.5 + ] + } + }, + { + "from": [ + -9.0, + 0.3424499999999995, + 15.34245 + ], + "to": [ + -5.5, + 8.65755, + 23.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + } + } + }, + { + "from": [ + 21.5, + 0.3424499999999995, + 15.34245 + ], + "to": [ + 25.0, + 8.65755, + 23.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + } + } + }, + { + "from": [ + -8.97, + 0.3424499999999995, + 15.34245 + ], + "to": [ + -5.53, + 8.65755, + 23.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -7.25, + 4.5, + 19.5 + ] + } + }, + { + "from": [ + 21.53, + 0.3424499999999995, + 15.34245 + ], + "to": [ + 24.97, + 8.65755, + 23.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 23.25, + 4.5, + 19.5 + ] + } + }, + { + "from": [ + -9.0, + 0.3424499999999995, + 23.34245 + ], + "to": [ + -5.5, + 8.65755, + 31.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + } + } + }, + { + "from": [ + 21.5, + 0.3424499999999995, + 23.34245 + ], + "to": [ + 25.0, + 8.65755, + 31.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + } + } + }, + { + "from": [ + -8.97, + 0.3424499999999995, + 23.34245 + ], + "to": [ + -5.53, + 8.65755, + 31.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -7.25, + 4.5, + 27.5 + ] + } + }, + { + "from": [ + 21.53, + 0.3424499999999995, + 23.34245 + ], + "to": [ + 24.97, + 8.65755, + 31.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 23.25, + 4.5, + 27.5 + ] + } + } + ] +} \ No newline at end of file diff --git a/airdef-mod/assets/airdef/models/block/flare.json b/airdef-mod/assets/airdef/models/block/flare.json index 4a2311f..a70d416 100644 --- a/airdef-mod/assets/airdef/models/block/flare.json +++ b/airdef-mod/assets/airdef/models/block/flare.json @@ -2,7 +2,7 @@ "ambientocclusion": false, "textures": { "lamp": "airdef:block/lamp", - "antenna": "airdef:block/antenna", + "bare_antenna": "airdef:block/bare_antenna", "particle": "airdef:block/lamp" }, "elements": [ @@ -93,7 +93,7 @@ 0.8000000000000007, 6.5 ], - "texture": "#antenna" + "texture": "#bare_antenna" }, "south": { "uv": [ @@ -102,7 +102,7 @@ 0.8000000000000007, 6.5 ], - "texture": "#antenna" + "texture": "#bare_antenna" }, "east": { "uv": [ @@ -111,7 +111,7 @@ 0.8000000000000007, 6.5 ], - "texture": "#antenna" + "texture": "#bare_antenna" }, "west": { "uv": [ @@ -120,7 +120,7 @@ 0.8000000000000007, 6.5 ], - "texture": "#antenna" + "texture": "#bare_antenna" }, "up": { "uv": [ @@ -129,7 +129,7 @@ 0.8000000000000007, 0.8000000000000007 ], - "texture": "#antenna" + "texture": "#bare_antenna" }, "down": { "uv": [ @@ -138,7 +138,7 @@ 0.8000000000000007, 0.8000000000000007 ], - "texture": "#antenna" + "texture": "#bare_antenna" } } } diff --git a/airdef-mod/assets/airdef/models/block/gepard_dish.json b/airdef-mod/assets/airdef/models/block/gepard_dish.json index 8118c34..b8b0554 100644 --- a/airdef-mod/assets/airdef/models/block/gepard_dish.json +++ b/airdef-mod/assets/airdef/models/block/gepard_dish.json @@ -1,9 +1,9 @@ { "ambientocclusion": false, "textures": { - "dish": "airdef:block/dish", + "bare_dish": "airdef:block/bare_dish", "metal": "airdef:block/metal", - "particle": "airdef:block/dish" + "particle": "airdef:block/bare_dish" }, "elements": [ { @@ -25,7 +25,7 @@ 16, 8.0 ], - "texture": "#dish" + "texture": "#bare_dish" }, "south": { "uv": [ @@ -34,7 +34,7 @@ 16, 8.0 ], - "texture": "#dish" + "texture": "#bare_dish" }, "east": { "uv": [ @@ -43,7 +43,7 @@ 2.0, 8.0 ], - "texture": "#dish" + "texture": "#bare_dish" }, "west": { "uv": [ @@ -52,7 +52,7 @@ 2.0, 8.0 ], - "texture": "#dish" + "texture": "#bare_dish" }, "up": { "uv": [ @@ -61,7 +61,7 @@ 16, 2.0 ], - "texture": "#dish" + "texture": "#bare_dish" }, "down": { "uv": [ @@ -70,7 +70,7 @@ 16, 2.0 ], - "texture": "#dish" + "texture": "#bare_dish" } } }, diff --git a/airdef-mod/assets/airdef/models/block/gepard_guns.json b/airdef-mod/assets/airdef/models/block/gepard_guns.json index 995be88..a62e408 100644 --- a/airdef-mod/assets/airdef/models/block/gepard_guns.json +++ b/airdef-mod/assets/airdef/models/block/gepard_guns.json @@ -1,10 +1,10 @@ { "ambientocclusion": false, "textures": { - "barrel": "airdef:block/barrel", + "bare_barrel": "airdef:block/bare_barrel", "flecktarn": "airdef:block/flecktarn", "dark_metal": "airdef:block/dark_metal", - "particle": "airdef:block/barrel" + "particle": "airdef:block/bare_barrel" }, "elements": [ { @@ -26,7 +26,7 @@ 2.5, 2.5 ], - "texture": "#barrel" + "texture": "#bare_barrel" }, "south": { "uv": [ @@ -35,7 +35,7 @@ 2.5, 2.5 ], - "texture": "#barrel" + "texture": "#bare_barrel" }, "east": { "uv": [ @@ -44,7 +44,7 @@ 16, 2.5 ], - "texture": "#barrel" + "texture": "#bare_barrel" }, "west": { "uv": [ @@ -53,7 +53,7 @@ 16, 2.5 ], - "texture": "#barrel" + "texture": "#bare_barrel" }, "up": { "uv": [ @@ -62,7 +62,7 @@ 2.5, 16 ], - "texture": "#barrel" + "texture": "#bare_barrel" }, "down": { "uv": [ @@ -71,7 +71,7 @@ 2.5, 16 ], - "texture": "#barrel" + "texture": "#bare_barrel" } } }, @@ -94,7 +94,7 @@ 2.5, 2.5 ], - "texture": "#barrel" + "texture": "#bare_barrel" }, "south": { "uv": [ @@ -103,7 +103,7 @@ 2.5, 2.5 ], - "texture": "#barrel" + "texture": "#bare_barrel" }, "east": { "uv": [ @@ -112,7 +112,7 @@ 16, 2.5 ], - "texture": "#barrel" + "texture": "#bare_barrel" }, "west": { "uv": [ @@ -121,7 +121,7 @@ 16, 2.5 ], - "texture": "#barrel" + "texture": "#bare_barrel" }, "up": { "uv": [ @@ -130,7 +130,7 @@ 2.5, 16 ], - "texture": "#barrel" + "texture": "#bare_barrel" }, "down": { "uv": [ @@ -139,7 +139,7 @@ 2.5, 16 ], - "texture": "#barrel" + "texture": "#bare_barrel" } } }, diff --git a/airdef-mod/assets/airdef/models/block/gepard_guns_burnt.json b/airdef-mod/assets/airdef/models/block/gepard_guns_burnt.json new file mode 100644 index 0000000..e2d3531 --- /dev/null +++ b/airdef-mod/assets/airdef/models/block/gepard_guns_burnt.json @@ -0,0 +1,351 @@ +{ + "ambientocclusion": false, + "textures": { + "bare_barrel_b": "airdef:block/bare_barrel_b", + "flecktarn_b": "airdef:block/flecktarn_b", + "dark_metal_b": "airdef:block/dark_metal_b", + "particle": "airdef:block/bare_barrel_b" + }, + "elements": [ + { + "from": [ + -8.0, + 5.0, + -16.0 + ], + "to": [ + -5.5, + 7.5, + 12.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 2.5, + 2.5 + ], + "texture": "#bare_barrel_b" + }, + "south": { + "uv": [ + 0, + 0, + 2.5, + 2.5 + ], + "texture": "#bare_barrel_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 2.5 + ], + "texture": "#bare_barrel_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 2.5 + ], + "texture": "#bare_barrel_b" + }, + "up": { + "uv": [ + 0, + 0, + 2.5, + 16 + ], + "texture": "#bare_barrel_b" + }, + "down": { + "uv": [ + 0, + 0, + 2.5, + 16 + ], + "texture": "#bare_barrel_b" + } + } + }, + { + "from": [ + 21.5, + 5.0, + -16.0 + ], + "to": [ + 24.0, + 7.5, + 12.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 2.5, + 2.5 + ], + "texture": "#bare_barrel_b" + }, + "south": { + "uv": [ + 0, + 0, + 2.5, + 2.5 + ], + "texture": "#bare_barrel_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 2.5 + ], + "texture": "#bare_barrel_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 2.5 + ], + "texture": "#bare_barrel_b" + }, + "up": { + "uv": [ + 0, + 0, + 2.5, + 16 + ], + "texture": "#bare_barrel_b" + }, + "down": { + "uv": [ + 0, + 0, + 2.5, + 16 + ], + "texture": "#bare_barrel_b" + } + } + }, + { + "from": [ + -9.0, + 3.5, + 2.0 + ], + "to": [ + -4.0, + 9.0, + 14.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 5.0, + 5.5 + ], + "texture": "#flecktarn_b" + }, + "south": { + "uv": [ + 0, + 0, + 5.0, + 5.5 + ], + "texture": "#flecktarn_b" + }, + "east": { + "uv": [ + 0, + 0, + 12.0, + 5.5 + ], + "texture": "#flecktarn_b" + }, + "west": { + "uv": [ + 0, + 0, + 12.0, + 5.5 + ], + "texture": "#flecktarn_b" + }, + "up": { + "uv": [ + 0, + 0, + 5.0, + 12.0 + ], + "texture": "#flecktarn_b" + }, + "down": { + "uv": [ + 0, + 0, + 5.0, + 12.0 + ], + "texture": "#flecktarn_b" + } + } + }, + { + "from": [ + 20.0, + 3.5, + 2.0 + ], + "to": [ + 25.0, + 9.0, + 14.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 5.0, + 5.5 + ], + "texture": "#flecktarn_b" + }, + "south": { + "uv": [ + 0, + 0, + 5.0, + 5.5 + ], + "texture": "#flecktarn_b" + }, + "east": { + "uv": [ + 0, + 0, + 12.0, + 5.5 + ], + "texture": "#flecktarn_b" + }, + "west": { + "uv": [ + 0, + 0, + 12.0, + 5.5 + ], + "texture": "#flecktarn_b" + }, + "up": { + "uv": [ + 0, + 0, + 5.0, + 12.0 + ], + "texture": "#flecktarn_b" + }, + "down": { + "uv": [ + 0, + 0, + 5.0, + 12.0 + ], + "texture": "#flecktarn_b" + } + } + }, + { + "from": [ + -8.5, + 4.5, + -16.0 + ], + "to": [ + -5.0, + 8.0, + -13.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.5, + 3.5 + ], + "texture": "#dark_metal_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.5, + 3.5 + ], + "texture": "#dark_metal_b" + }, + "east": { + "uv": [ + 0, + 0, + 3.0, + 3.5 + ], + "texture": "#dark_metal_b" + }, + "west": { + "uv": [ + 0, + 0, + 3.0, + 3.5 + ], + "texture": "#dark_metal_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.5, + 3.0 + ], + "texture": "#dark_metal_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.5, + 3.0 + ], + "texture": "#dark_metal_b" + } + } + } + ] +} \ No newline at end of file diff --git a/airdef-mod/assets/airdef/models/block/gepard_hull.json b/airdef-mod/assets/airdef/models/block/gepard_hull.json index 7c5d646..8df7024 100644 --- a/airdef-mod/assets/airdef/models/block/gepard_hull.json +++ b/airdef-mod/assets/airdef/models/block/gepard_hull.json @@ -1,11 +1,15 @@ { "ambientocclusion": false, "textures": { + "flecktarn_s21": "airdef:block/flecktarn_s21", + "flecktarn_s31": "airdef:block/flecktarn_s31", + "flecktarn_s23": "airdef:block/flecktarn_s23", "flecktarn": "airdef:block/flecktarn", "dark_metal": "airdef:block/dark_metal", "metal": "airdef:block/metal", "track": "airdef:block/track", - "particle": "airdef:block/flecktarn" + "flecktarn_s13": "airdef:block/flecktarn_s13", + "particle": "airdef:block/flecktarn_s21" }, "elements": [ { @@ -27,7 +31,7 @@ 16, 13.0 ], - "texture": "#flecktarn" + "texture": "#flecktarn_s21" }, "south": { "uv": [ @@ -36,7 +40,7 @@ 16, 13.0 ], - "texture": "#flecktarn" + "texture": "#flecktarn_s21" }, "east": { "uv": [ @@ -45,7 +49,7 @@ 16, 13.0 ], - "texture": "#flecktarn" + "texture": "#flecktarn_s31" }, "west": { "uv": [ @@ -54,7 +58,7 @@ 16, 13.0 ], - "texture": "#flecktarn" + "texture": "#flecktarn_s31" }, "up": { "uv": [ @@ -63,7 +67,7 @@ 16, 16 ], - "texture": "#flecktarn" + "texture": "#flecktarn_s23" }, "down": { "uv": [ @@ -72,7 +76,7 @@ 16, 16 ], - "texture": "#flecktarn" + "texture": "#flecktarn_s23" } } }, @@ -95,7 +99,7 @@ 16, 8.0 ], - "texture": "#flecktarn" + "texture": "#flecktarn_s21" }, "south": { "uv": [ @@ -104,7 +108,7 @@ 16, 8.0 ], - "texture": "#flecktarn" + "texture": "#flecktarn_s21" }, "east": { "uv": [ @@ -131,7 +135,7 @@ 16, 4.0 ], - "texture": "#flecktarn" + "texture": "#flecktarn_s21" }, "down": { "uv": [ @@ -140,7 +144,7 @@ 16, 4.0 ], - "texture": "#flecktarn" + "texture": "#flecktarn_s21" } } }, @@ -453,7 +457,7 @@ 16, 5.0 ], - "texture": "#flecktarn" + "texture": "#flecktarn_s31" }, "west": { "uv": [ @@ -462,7 +466,7 @@ 16, 5.0 ], - "texture": "#flecktarn" + "texture": "#flecktarn_s31" }, "up": { "uv": [ @@ -471,7 +475,7 @@ 4.5, 16 ], - "texture": "#flecktarn" + "texture": "#flecktarn_s13" }, "down": { "uv": [ @@ -480,7 +484,7 @@ 4.5, 16 ], - "texture": "#flecktarn" + "texture": "#flecktarn_s13" } } }, @@ -521,7 +525,7 @@ 16, 5.0 ], - "texture": "#flecktarn" + "texture": "#flecktarn_s31" }, "west": { "uv": [ @@ -530,7 +534,7 @@ 16, 5.0 ], - "texture": "#flecktarn" + "texture": "#flecktarn_s31" }, "up": { "uv": [ @@ -539,7 +543,7 @@ 4.5, 16 ], - "texture": "#flecktarn" + "texture": "#flecktarn_s13" }, "down": { "uv": [ @@ -548,7 +552,7 @@ 4.5, 16 ], - "texture": "#flecktarn" + "texture": "#flecktarn_s13" } } } diff --git a/airdef-mod/assets/airdef/models/block/gepard_hull_burnt.json b/airdef-mod/assets/airdef/models/block/gepard_hull_burnt.json new file mode 100644 index 0000000..b871dda --- /dev/null +++ b/airdef-mod/assets/airdef/models/block/gepard_hull_burnt.json @@ -0,0 +1,560 @@ +{ + "ambientocclusion": false, + "textures": { + "flecktarn_s21_b": "airdef:block/flecktarn_s21_b", + "flecktarn_s31_b": "airdef:block/flecktarn_s31_b", + "flecktarn_s23_b": "airdef:block/flecktarn_s23_b", + "flecktarn_b": "airdef:block/flecktarn_b", + "dark_metal_b": "airdef:block/dark_metal_b", + "metal_b": "airdef:block/metal_b", + "track_b": "airdef:block/track_b", + "flecktarn_s13_b": "airdef:block/flecktarn_s13_b", + "particle": "airdef:block/flecktarn_s21_b" + }, + "elements": [ + { + "from": [ + -10.0, + 4.0, + -12.0 + ], + "to": [ + 26.0, + 17.0, + 30.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 13.0 + ], + "texture": "#flecktarn_s21_b" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 13.0 + ], + "texture": "#flecktarn_s21_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 13.0 + ], + "texture": "#flecktarn_s31_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 13.0 + ], + "texture": "#flecktarn_s31_b" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#flecktarn_s23_b" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#flecktarn_s23_b" + } + } + }, + { + "from": [ + -10.0, + 4.0, + -16.0 + ], + "to": [ + 26.0, + 12.0, + -12.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 8.0 + ], + "texture": "#flecktarn_s21_b" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 8.0 + ], + "texture": "#flecktarn_s21_b" + }, + "east": { + "uv": [ + 0, + 0, + 4.0, + 8.0 + ], + "texture": "#flecktarn_b" + }, + "west": { + "uv": [ + 0, + 0, + 4.0, + 8.0 + ], + "texture": "#flecktarn_b" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#flecktarn_s21_b" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#flecktarn_s21_b" + } + } + }, + { + "from": [ + -8.0, + 17.0, + 18.0 + ], + "to": [ + 24.0, + 18.0, + 30.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 1.0 + ], + "texture": "#dark_metal_b" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 1.0 + ], + "texture": "#dark_metal_b" + }, + "east": { + "uv": [ + 0, + 0, + 12.0, + 1.0 + ], + "texture": "#dark_metal_b" + }, + "west": { + "uv": [ + 0, + 0, + 12.0, + 1.0 + ], + "texture": "#dark_metal_b" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 12.0 + ], + "texture": "#dark_metal_b" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 12.0 + ], + "texture": "#dark_metal_b" + } + } + }, + { + "from": [ + -6.0, + 17.0, + -10.0 + ], + "to": [ + 4.0, + 18.0, + -4.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 10.0, + 1.0 + ], + "texture": "#metal_b" + }, + "south": { + "uv": [ + 0, + 0, + 10.0, + 1.0 + ], + "texture": "#metal_b" + }, + "east": { + "uv": [ + 0, + 0, + 6.0, + 1.0 + ], + "texture": "#metal_b" + }, + "west": { + "uv": [ + 0, + 0, + 6.0, + 1.0 + ], + "texture": "#metal_b" + }, + "up": { + "uv": [ + 0, + 0, + 10.0, + 6.0 + ], + "texture": "#metal_b" + }, + "down": { + "uv": [ + 0, + 0, + 10.0, + 6.0 + ], + "texture": "#metal_b" + } + } + }, + { + "from": [ + -14.0, + 0.0, + -14.0 + ], + "to": [ + -10.0, + 10.0, + 31.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 4.0, + 10.0 + ], + "texture": "#track_b" + }, + "south": { + "uv": [ + 0, + 0, + 4.0, + 10.0 + ], + "texture": "#track_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 10.0 + ], + "texture": "#track_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 10.0 + ], + "texture": "#track_b" + }, + "up": { + "uv": [ + 0, + 0, + 4.0, + 16 + ], + "texture": "#track_b" + }, + "down": { + "uv": [ + 0, + 0, + 4.0, + 16 + ], + "texture": "#track_b" + } + } + }, + { + "from": [ + 26.0, + 0.0, + -14.0 + ], + "to": [ + 30.0, + 10.0, + 31.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 4.0, + 10.0 + ], + "texture": "#track_b" + }, + "south": { + "uv": [ + 0, + 0, + 4.0, + 10.0 + ], + "texture": "#track_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 10.0 + ], + "texture": "#track_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 10.0 + ], + "texture": "#track_b" + }, + "up": { + "uv": [ + 0, + 0, + 4.0, + 16 + ], + "texture": "#track_b" + }, + "down": { + "uv": [ + 0, + 0, + 4.0, + 16 + ], + "texture": "#track_b" + } + } + }, + { + "from": [ + -14.5, + 6.0, + -14.0 + ], + "to": [ + -10.0, + 11.0, + 31.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 4.5, + 5.0 + ], + "texture": "#flecktarn_b" + }, + "south": { + "uv": [ + 0, + 0, + 4.5, + 5.0 + ], + "texture": "#flecktarn_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 5.0 + ], + "texture": "#flecktarn_s31_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 5.0 + ], + "texture": "#flecktarn_s31_b" + }, + "up": { + "uv": [ + 0, + 0, + 4.5, + 16 + ], + "texture": "#flecktarn_s13_b" + }, + "down": { + "uv": [ + 0, + 0, + 4.5, + 16 + ], + "texture": "#flecktarn_s13_b" + } + } + }, + { + "from": [ + 26.0, + 6.0, + -14.0 + ], + "to": [ + 30.5, + 11.0, + 31.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 4.5, + 5.0 + ], + "texture": "#flecktarn_b" + }, + "south": { + "uv": [ + 0, + 0, + 4.5, + 5.0 + ], + "texture": "#flecktarn_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 5.0 + ], + "texture": "#flecktarn_s31_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 5.0 + ], + "texture": "#flecktarn_s31_b" + }, + "up": { + "uv": [ + 0, + 0, + 4.5, + 16 + ], + "texture": "#flecktarn_s13_b" + }, + "down": { + "uv": [ + 0, + 0, + 4.5, + 16 + ], + "texture": "#flecktarn_s13_b" + } + } + } + ] +} \ No newline at end of file diff --git a/airdef-mod/assets/airdef/models/block/gepard_turret.json b/airdef-mod/assets/airdef/models/block/gepard_turret.json index 818d214..424bc78 100644 --- a/airdef-mod/assets/airdef/models/block/gepard_turret.json +++ b/airdef-mod/assets/airdef/models/block/gepard_turret.json @@ -1,10 +1,11 @@ { "ambientocclusion": false, "textures": { + "flecktarn_s21": "airdef:block/flecktarn_s21", "flecktarn": "airdef:block/flecktarn", "radar_face": "airdef:block/radar_face", "metal": "airdef:block/metal", - "particle": "airdef:block/flecktarn" + "particle": "airdef:block/flecktarn_s21" }, "elements": [ { @@ -26,7 +27,7 @@ 16, 12.0 ], - "texture": "#flecktarn" + "texture": "#flecktarn_s21" }, "south": { "uv": [ @@ -35,7 +36,7 @@ 16, 12.0 ], - "texture": "#flecktarn" + "texture": "#flecktarn_s21" }, "east": { "uv": [ @@ -62,7 +63,7 @@ 16, 16 ], - "texture": "#flecktarn" + "texture": "#flecktarn_s21" }, "down": { "uv": [ @@ -71,7 +72,7 @@ 16, 16 ], - "texture": "#flecktarn" + "texture": "#flecktarn_s21" } } }, diff --git a/airdef-mod/assets/airdef/models/block/gepard_turret_burnt.json b/airdef-mod/assets/airdef/models/block/gepard_turret_burnt.json new file mode 100644 index 0000000..0648f9d --- /dev/null +++ b/airdef-mod/assets/airdef/models/block/gepard_turret_burnt.json @@ -0,0 +1,284 @@ +{ + "ambientocclusion": false, + "textures": { + "flecktarn_s21_b": "airdef:block/flecktarn_s21_b", + "flecktarn_b": "airdef:block/flecktarn_b", + "radar_face_b": "airdef:block/radar_face_b", + "metal_b": "airdef:block/metal_b", + "particle": "airdef:block/flecktarn_s21_b" + }, + "elements": [ + { + "from": [ + -4.0, + 0.0, + -6.0 + ], + "to": [ + 20.0, + 12.0, + 16.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 12.0 + ], + "texture": "#flecktarn_s21_b" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 12.0 + ], + "texture": "#flecktarn_s21_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 12.0 + ], + "texture": "#flecktarn_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 12.0 + ], + "texture": "#flecktarn_b" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#flecktarn_s21_b" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#flecktarn_s21_b" + } + } + }, + { + "from": [ + -2.0, + 12.0, + -2.0 + ], + "to": [ + 18.0, + 14.0, + 14.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 2.0 + ], + "texture": "#flecktarn_b" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 2.0 + ], + "texture": "#flecktarn_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 2.0 + ], + "texture": "#flecktarn_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 2.0 + ], + "texture": "#flecktarn_b" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#flecktarn_b" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#flecktarn_b" + } + } + }, + { + "from": [ + 3.0, + 4.0, + -10.0 + ], + "to": [ + 13.0, + 12.0, + -6.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 10.0, + 8.0 + ], + "texture": "#radar_face_b" + }, + "south": { + "uv": [ + 0, + 0, + 10.0, + 8.0 + ], + "texture": "#radar_face_b" + }, + "east": { + "uv": [ + 0, + 0, + 4.0, + 8.0 + ], + "texture": "#radar_face_b" + }, + "west": { + "uv": [ + 0, + 0, + 4.0, + 8.0 + ], + "texture": "#radar_face_b" + }, + "up": { + "uv": [ + 0, + 0, + 10.0, + 4.0 + ], + "texture": "#radar_face_b" + }, + "down": { + "uv": [ + 0, + 0, + 10.0, + 4.0 + ], + "texture": "#radar_face_b" + } + } + }, + { + "from": [ + 7.0, + 14.0, + 10.0 + ], + "to": [ + 9.0, + 18.0, + 12.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 2.0, + 4.0 + ], + "texture": "#metal_b" + }, + "south": { + "uv": [ + 0, + 0, + 2.0, + 4.0 + ], + "texture": "#metal_b" + }, + "east": { + "uv": [ + 0, + 0, + 2.0, + 4.0 + ], + "texture": "#metal_b" + }, + "west": { + "uv": [ + 0, + 0, + 2.0, + 4.0 + ], + "texture": "#metal_b" + }, + "up": { + "uv": [ + 0, + 0, + 2.0, + 2.0 + ], + "texture": "#metal_b" + }, + "down": { + "uv": [ + 0, + 0, + 2.0, + 2.0 + ], + "texture": "#metal_b" + } + } + } + ] +} \ No newline at end of file diff --git a/airdef-mod/assets/airdef/models/block/geran3.json b/airdef-mod/assets/airdef/models/block/geran3.json index 22d0981..1b66363 100644 --- a/airdef-mod/assets/airdef/models/block/geran3.json +++ b/airdef-mod/assets/airdef/models/block/geran3.json @@ -3,8 +3,7 @@ "textures": { "geran": "airdef:block/geran", "geran_engine": "airdef:block/geran_engine", - "intake": "airdef:block/intake", - "nozzle": "airdef:block/nozzle", + "bare_nozzle": "airdef:block/bare_nozzle", "particle": "airdef:block/geran" }, "elements": [ @@ -1047,7 +1046,7 @@ 6.0, 4.0 ], - "texture": "#intake" + "texture": "#bare_nozzle" }, "south": { "uv": [ @@ -1056,7 +1055,7 @@ 6.0, 4.0 ], - "texture": "#intake" + "texture": "#bare_nozzle" }, "east": { "uv": [ @@ -1065,7 +1064,7 @@ 1.0, 4.0 ], - "texture": "#intake" + "texture": "#bare_nozzle" }, "west": { "uv": [ @@ -1074,7 +1073,7 @@ 1.0, 4.0 ], - "texture": "#intake" + "texture": "#bare_nozzle" }, "up": { "uv": [ @@ -1083,7 +1082,7 @@ 6.0, 1.0 ], - "texture": "#intake" + "texture": "#bare_nozzle" }, "down": { "uv": [ @@ -1092,7 +1091,7 @@ 6.0, 1.0 ], - "texture": "#intake" + "texture": "#bare_nozzle" } } }, @@ -1115,7 +1114,7 @@ 5.0, 4.0 ], - "texture": "#nozzle" + "texture": "#bare_nozzle" }, "south": { "uv": [ @@ -1124,7 +1123,7 @@ 5.0, 4.0 ], - "texture": "#nozzle" + "texture": "#bare_nozzle" }, "east": { "uv": [ @@ -1133,7 +1132,7 @@ 2.0, 4.0 ], - "texture": "#nozzle" + "texture": "#bare_nozzle" }, "west": { "uv": [ @@ -1142,7 +1141,7 @@ 2.0, 4.0 ], - "texture": "#nozzle" + "texture": "#bare_nozzle" }, "up": { "uv": [ @@ -1151,7 +1150,7 @@ 5.0, 2.0 ], - "texture": "#nozzle" + "texture": "#bare_nozzle" }, "down": { "uv": [ @@ -1160,7 +1159,7 @@ 5.0, 2.0 ], - "texture": "#nozzle" + "texture": "#bare_nozzle" } } } diff --git a/airdef-mod/assets/airdef/models/block/irist_chassis.json b/airdef-mod/assets/airdef/models/block/irist_chassis.json index a2bcf5e..caa06d3 100644 --- a/airdef-mod/assets/airdef/models/block/irist_chassis.json +++ b/airdef-mod/assets/airdef/models/block/irist_chassis.json @@ -1,12 +1,16 @@ { "ambientocclusion": false, "textures": { + "nato_green_s21": "airdef:block/nato_green_s21", + "nato_green_s31": "airdef:block/nato_green_s31", + "nato_green_s23": "airdef:block/nato_green_s23", + "glass_cab": "airdef:block/glass_cab", "nato_green": "airdef:block/nato_green", - "glass": "airdef:block/glass", "dark_metal": "airdef:block/dark_metal", "metal": "airdef:block/metal", "tire": "airdef:block/tire", - "particle": "airdef:block/nato_green" + "hub": "airdef:block/hub", + "particle": "airdef:block/nato_green_s21" }, "elements": [ { @@ -28,7 +32,7 @@ 16, 5.0 ], - "texture": "#nato_green" + "texture": "#nato_green_s21" }, "south": { "uv": [ @@ -37,7 +41,7 @@ 16, 5.0 ], - "texture": "#nato_green" + "texture": "#nato_green_s21" }, "east": { "uv": [ @@ -46,7 +50,7 @@ 16, 5.0 ], - "texture": "#nato_green" + "texture": "#nato_green_s31" }, "west": { "uv": [ @@ -55,7 +59,7 @@ 16, 5.0 ], - "texture": "#nato_green" + "texture": "#nato_green_s31" }, "up": { "uv": [ @@ -64,7 +68,7 @@ 16, 16 ], - "texture": "#nato_green" + "texture": "#nato_green_s23" }, "down": { "uv": [ @@ -73,7 +77,7 @@ 16, 16 ], - "texture": "#nato_green" + "texture": "#nato_green_s23" } } }, @@ -96,7 +100,7 @@ 9.0, 9.0 ], - "texture": "#glass" + "texture": "#glass_cab" }, "south": { "uv": [ @@ -164,7 +168,7 @@ 9.0, 9.0 ], - "texture": "#glass" + "texture": "#glass_cab" }, "south": { "uv": [ @@ -300,7 +304,7 @@ 16, 3.0 ], - "texture": "#nato_green" + "texture": "#nato_green_s21" }, "south": { "uv": [ @@ -309,7 +313,7 @@ 16, 3.0 ], - "texture": "#nato_green" + "texture": "#nato_green_s21" }, "east": { "uv": [ @@ -336,7 +340,7 @@ 16, 10.0 ], - "texture": "#nato_green" + "texture": "#nato_green_s21" }, "down": { "uv": [ @@ -345,7 +349,7 @@ 16, 10.0 ], - "texture": "#nato_green" + "texture": "#nato_green_s21" } } }, @@ -556,13 +560,13 @@ { "from": [ -9.0, - 0.0, - -14.0 + 0.3424499999999995, + -14.65755 ], "to": [ -5.5, - 9.0, - -7.0 + 8.65755, + -6.3424499999999995 ], "faces": { "north": { @@ -570,7 +574,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -579,7 +583,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -587,26 +591,26 @@ "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -615,7 +619,7 @@ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" } @@ -624,13 +628,13 @@ { "from": [ 21.5, - 0.0, - -14.0 + 0.3424499999999995, + -14.65755 ], "to": [ 25.0, - 9.0, - -7.0 + 8.65755, + -6.3424499999999995 ], "faces": { "north": { @@ -638,7 +642,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -647,7 +651,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -655,26 +659,26 @@ "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -683,22 +687,176 @@ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" } } }, + { + "from": [ + -8.97, + 0.3424499999999995, + -14.65755 + ], + "to": [ + -5.53, + 8.65755, + -6.3424499999999995 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -7.25, + 4.5, + -10.5 + ] + } + }, + { + "from": [ + 21.53, + 0.3424499999999995, + -14.65755 + ], + "to": [ + 24.97, + 8.65755, + -6.3424499999999995 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 23.25, + 4.5, + -10.5 + ] + } + }, { "from": [ -9.0, - 0.0, - -5.0 + 0.3424499999999995, + -5.6575500000000005 ], "to": [ -5.5, - 9.0, - 2.0 + 8.65755, + 2.6575500000000005 ], "faces": { "north": { @@ -706,7 +864,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -715,7 +873,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -723,26 +881,26 @@ "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -751,7 +909,7 @@ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" } @@ -760,13 +918,13 @@ { "from": [ 21.5, - 0.0, - -5.0 + 0.3424499999999995, + -5.6575500000000005 ], "to": [ 25.0, - 9.0, - 2.0 + 8.65755, + 2.6575500000000005 ], "faces": { "north": { @@ -774,7 +932,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -783,7 +941,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -791,26 +949,26 @@ "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -819,22 +977,176 @@ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" } } }, + { + "from": [ + -8.97, + 0.3424499999999995, + -5.6575500000000005 + ], + "to": [ + -5.53, + 8.65755, + 2.6575500000000005 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -7.25, + 4.5, + -1.5 + ] + } + }, + { + "from": [ + 21.53, + 0.3424499999999995, + -5.6575500000000005 + ], + "to": [ + 24.97, + 8.65755, + 2.6575500000000005 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 23.25, + 4.5, + -1.5 + ] + } + }, { "from": [ -9.0, - 0.0, - 13.0 + 0.3424499999999995, + 12.34245 ], "to": [ -5.5, - 9.0, - 20.0 + 8.65755, + 20.65755 ], "faces": { "north": { @@ -842,7 +1154,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -851,7 +1163,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -859,26 +1171,26 @@ "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -887,7 +1199,7 @@ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" } @@ -896,13 +1208,13 @@ { "from": [ 21.5, - 0.0, - 13.0 + 0.3424499999999995, + 12.34245 ], "to": [ 25.0, - 9.0, - 20.0 + 8.65755, + 20.65755 ], "faces": { "north": { @@ -910,7 +1222,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -919,7 +1231,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -927,26 +1239,26 @@ "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -955,22 +1267,176 @@ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" } } }, + { + "from": [ + -8.97, + 0.3424499999999995, + 12.34245 + ], + "to": [ + -5.53, + 8.65755, + 20.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -7.25, + 4.5, + 16.5 + ] + } + }, + { + "from": [ + 21.53, + 0.3424499999999995, + 12.34245 + ], + "to": [ + 24.97, + 8.65755, + 20.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 23.25, + 4.5, + 16.5 + ] + } + }, { "from": [ -9.0, - 0.0, - 22.0 + 0.3424499999999995, + 21.34245 ], "to": [ -5.5, - 9.0, - 29.0 + 8.65755, + 29.65755 ], "faces": { "north": { @@ -978,7 +1444,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -987,7 +1453,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -995,26 +1461,26 @@ "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -1023,7 +1489,7 @@ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" } @@ -1032,13 +1498,13 @@ { "from": [ 21.5, - 0.0, - 22.0 + 0.3424499999999995, + 21.34245 ], "to": [ 25.0, - 9.0, - 29.0 + 8.65755, + 29.65755 ], "faces": { "north": { @@ -1046,7 +1512,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -1055,7 +1521,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -1063,26 +1529,26 @@ "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -1091,11 +1557,165 @@ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" } } + }, + { + "from": [ + -8.97, + 0.3424499999999995, + 21.34245 + ], + "to": [ + -5.53, + 8.65755, + 29.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -7.25, + 4.5, + 25.5 + ] + } + }, + { + "from": [ + 21.53, + 0.3424499999999995, + 21.34245 + ], + "to": [ + 24.97, + 8.65755, + 29.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 23.25, + 4.5, + 25.5 + ] + } } ] } \ No newline at end of file diff --git a/airdef-mod/assets/airdef/models/block/irist_chassis_burnt.json b/airdef-mod/assets/airdef/models/block/irist_chassis_burnt.json new file mode 100644 index 0000000..e056272 --- /dev/null +++ b/airdef-mod/assets/airdef/models/block/irist_chassis_burnt.json @@ -0,0 +1,1653 @@ +{ + "ambientocclusion": false, + "textures": { + "nato_green_s21_b": "airdef:block/nato_green_s21_b", + "nato_green_s31_b": "airdef:block/nato_green_s31_b", + "nato_green_s23_b": "airdef:block/nato_green_s23_b", + "glass_cab_b": "airdef:block/glass_cab_b", + "nato_green_b": "airdef:block/nato_green_b", + "dark_metal_b": "airdef:block/dark_metal_b", + "metal_b": "airdef:block/metal_b", + "tire_b": "airdef:block/tire_b", + "hub_b": "airdef:block/hub_b", + "particle": "airdef:block/nato_green_s21_b" + }, + "elements": [ + { + "from": [ + -6.0, + 5.0, + -16.0 + ], + "to": [ + 22.0, + 10.0, + 32.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 5.0 + ], + "texture": "#nato_green_s21_b" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 5.0 + ], + "texture": "#nato_green_s21_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 5.0 + ], + "texture": "#nato_green_s31_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 5.0 + ], + "texture": "#nato_green_s31_b" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#nato_green_s23_b" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#nato_green_s23_b" + } + } + }, + { + "from": [ + -6.0, + 10.0, + -16.0 + ], + "to": [ + 3.0, + 19.0, + -7.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 9.0, + 9.0 + ], + "texture": "#glass_cab_b" + }, + "south": { + "uv": [ + 0, + 0, + 9.0, + 9.0 + ], + "texture": "#nato_green_b" + }, + "east": { + "uv": [ + 0, + 0, + 9.0, + 9.0 + ], + "texture": "#nato_green_b" + }, + "west": { + "uv": [ + 0, + 0, + 9.0, + 9.0 + ], + "texture": "#nato_green_b" + }, + "up": { + "uv": [ + 0, + 0, + 9.0, + 9.0 + ], + "texture": "#nato_green_b" + }, + "down": { + "uv": [ + 0, + 0, + 9.0, + 9.0 + ], + "texture": "#nato_green_b" + } + } + }, + { + "from": [ + 13.0, + 10.0, + -16.0 + ], + "to": [ + 22.0, + 19.0, + -7.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 9.0, + 9.0 + ], + "texture": "#glass_cab_b" + }, + "south": { + "uv": [ + 0, + 0, + 9.0, + 9.0 + ], + "texture": "#nato_green_b" + }, + "east": { + "uv": [ + 0, + 0, + 9.0, + 9.0 + ], + "texture": "#nato_green_b" + }, + "west": { + "uv": [ + 0, + 0, + 9.0, + 9.0 + ], + "texture": "#nato_green_b" + }, + "up": { + "uv": [ + 0, + 0, + 9.0, + 9.0 + ], + "texture": "#nato_green_b" + }, + "down": { + "uv": [ + 0, + 0, + 9.0, + 9.0 + ], + "texture": "#nato_green_b" + } + } + }, + { + "from": [ + 3.0, + 10.0, + -16.0 + ], + "to": [ + 13.0, + 15.0, + -6.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 10.0, + 5.0 + ], + "texture": "#dark_metal_b" + }, + "south": { + "uv": [ + 0, + 0, + 10.0, + 5.0 + ], + "texture": "#dark_metal_b" + }, + "east": { + "uv": [ + 0, + 0, + 10.0, + 5.0 + ], + "texture": "#dark_metal_b" + }, + "west": { + "uv": [ + 0, + 0, + 10.0, + 5.0 + ], + "texture": "#dark_metal_b" + }, + "up": { + "uv": [ + 0, + 0, + 10.0, + 10.0 + ], + "texture": "#dark_metal_b" + }, + "down": { + "uv": [ + 0, + 0, + 10.0, + 10.0 + ], + "texture": "#dark_metal_b" + } + } + }, + { + "from": [ + -5.0, + 10.0, + -6.0 + ], + "to": [ + 21.0, + 13.0, + 4.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 3.0 + ], + "texture": "#nato_green_s21_b" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 3.0 + ], + "texture": "#nato_green_s21_b" + }, + "east": { + "uv": [ + 0, + 0, + 10.0, + 3.0 + ], + "texture": "#nato_green_b" + }, + "west": { + "uv": [ + 0, + 0, + 10.0, + 3.0 + ], + "texture": "#nato_green_b" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 10.0 + ], + "texture": "#nato_green_s21_b" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 10.0 + ], + "texture": "#nato_green_s21_b" + } + } + }, + { + "from": [ + -3.0, + 10.0, + 26.0 + ], + "to": [ + 19.0, + 14.0, + 32.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#dark_metal_b" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#dark_metal_b" + }, + "east": { + "uv": [ + 0, + 0, + 6.0, + 4.0 + ], + "texture": "#dark_metal_b" + }, + "west": { + "uv": [ + 0, + 0, + 6.0, + 4.0 + ], + "texture": "#dark_metal_b" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 6.0 + ], + "texture": "#dark_metal_b" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 6.0 + ], + "texture": "#dark_metal_b" + } + } + }, + { + "from": [ + -8.0, + 0.0, + 28.0 + ], + "to": [ + -6.0, + 6.0, + 31.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 2.0, + 6.0 + ], + "texture": "#metal_b" + }, + "south": { + "uv": [ + 0, + 0, + 2.0, + 6.0 + ], + "texture": "#metal_b" + }, + "east": { + "uv": [ + 0, + 0, + 3.0, + 6.0 + ], + "texture": "#metal_b" + }, + "west": { + "uv": [ + 0, + 0, + 3.0, + 6.0 + ], + "texture": "#metal_b" + }, + "up": { + "uv": [ + 0, + 0, + 2.0, + 3.0 + ], + "texture": "#metal_b" + }, + "down": { + "uv": [ + 0, + 0, + 2.0, + 3.0 + ], + "texture": "#metal_b" + } + } + }, + { + "from": [ + -9.0, + 0.3424499999999995, + -14.65755 + ], + "to": [ + -5.5, + 8.65755, + -6.3424499999999995 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + } + } + }, + { + "from": [ + 21.5, + 0.3424499999999995, + -14.65755 + ], + "to": [ + 25.0, + 8.65755, + -6.3424499999999995 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + } + } + }, + { + "from": [ + -8.97, + 0.3424499999999995, + -14.65755 + ], + "to": [ + -5.53, + 8.65755, + -6.3424499999999995 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -7.25, + 4.5, + -10.5 + ] + } + }, + { + "from": [ + 21.53, + 0.3424499999999995, + -14.65755 + ], + "to": [ + 24.97, + 8.65755, + -6.3424499999999995 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 23.25, + 4.5, + -10.5 + ] + } + }, + { + "from": [ + -9.0, + 0.3424499999999995, + -5.6575500000000005 + ], + "to": [ + -5.5, + 8.65755, + 2.6575500000000005 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + } + } + }, + { + "from": [ + 21.5, + 0.3424499999999995, + -5.6575500000000005 + ], + "to": [ + 25.0, + 8.65755, + 2.6575500000000005 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + } + } + }, + { + "from": [ + -8.97, + 0.3424499999999995, + -5.6575500000000005 + ], + "to": [ + -5.53, + 8.65755, + 2.6575500000000005 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -7.25, + 4.5, + -1.5 + ] + } + }, + { + "from": [ + 21.53, + 0.3424499999999995, + -5.6575500000000005 + ], + "to": [ + 24.97, + 8.65755, + 2.6575500000000005 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 23.25, + 4.5, + -1.5 + ] + } + }, + { + "from": [ + -9.0, + 0.3424499999999995, + 12.34245 + ], + "to": [ + -5.5, + 8.65755, + 20.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + } + } + }, + { + "from": [ + 21.5, + 0.3424499999999995, + 12.34245 + ], + "to": [ + 25.0, + 8.65755, + 20.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + } + } + }, + { + "from": [ + -8.97, + 0.3424499999999995, + 12.34245 + ], + "to": [ + -5.53, + 8.65755, + 20.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -7.25, + 4.5, + 16.5 + ] + } + }, + { + "from": [ + 21.53, + 0.3424499999999995, + 12.34245 + ], + "to": [ + 24.97, + 8.65755, + 20.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 23.25, + 4.5, + 16.5 + ] + } + }, + { + "from": [ + -9.0, + 0.3424499999999995, + 21.34245 + ], + "to": [ + -5.5, + 8.65755, + 29.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + } + } + }, + { + "from": [ + 21.5, + 0.3424499999999995, + 21.34245 + ], + "to": [ + 25.0, + 8.65755, + 29.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + } + } + }, + { + "from": [ + -8.97, + 0.3424499999999995, + 21.34245 + ], + "to": [ + -5.53, + 8.65755, + 29.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -7.25, + 4.5, + 25.5 + ] + } + }, + { + "from": [ + 21.53, + 0.3424499999999995, + 21.34245 + ], + "to": [ + 24.97, + 8.65755, + 29.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 23.25, + 4.5, + 25.5 + ] + } + } + ] +} \ No newline at end of file diff --git a/airdef-mod/assets/airdef/models/block/irist_missile.json b/airdef-mod/assets/airdef/models/block/irist_missile.json index e468964..e7cb5ca 100644 --- a/airdef-mod/assets/airdef/models/block/irist_missile.json +++ b/airdef-mod/assets/airdef/models/block/irist_missile.json @@ -2,29 +2,32 @@ "ambientocclusion": false, "textures": { "white": "airdef:block/white", + "rm_white": "airdef:block/rm_white", + "rm_white_t": "airdef:block/rm_white_t", "missile_grey": "airdef:block/missile_grey", - "nozzle": "airdef:block/nozzle", + "bare_nozzle": "airdef:block/bare_nozzle", + "glow_ember": "airdef:block/glow_ember", "particle": "airdef:block/white" }, "elements": [ { "from": [ - 7.333333333333333, - 7.333333333333333, + 7.294558312447602, + 7.294558312447602, -16.0 ], "to": [ - 8.666666666666666, - 8.666666666666666, - -14.0 + 8.705441687552398, + 8.705441687552398, + -13.666666666666666 ], "faces": { "north": { "uv": [ 0, 0, - 1.333333333333333, - 1.333333333333333 + 1.4108833751047953, + 1.4108833751047953 ], "texture": "#white" }, @@ -32,8 +35,8 @@ "uv": [ 0, 0, - 1.333333333333333, - 1.333333333333333 + 1.4108833751047953, + 1.4108833751047953 ], "texture": "#white" }, @@ -41,8 +44,8 @@ "uv": [ 0, 0, - 2.0, - 1.333333333333333 + 2.333333333333334, + 1.4108833751047953 ], "texture": "#white" }, @@ -50,8 +53,8 @@ "uv": [ 0, 0, - 2.0, - 1.333333333333333 + 2.333333333333334, + 1.4108833751047953 ], "texture": "#white" }, @@ -59,8 +62,8 @@ "uv": [ 0, 0, - 1.333333333333333, - 2.0 + 1.4108833751047953, + 2.333333333333334 ], "texture": "#white" }, @@ -68,8 +71,8 @@ "uv": [ 0, 0, - 1.333333333333333, - 2.0 + 1.4108833751047953, + 2.333333333333334 ], "texture": "#white" } @@ -77,22 +80,22 @@ }, { "from": [ - 7.0, - 7.0, - -14.0 + 7.294558312447602, + 7.294558312447602, + -15.97 ], "to": [ - 9.0, - 9.0, - -12.0 + 8.705441687552398, + 8.705441687552398, + -13.696666666666665 ], "faces": { "north": { "uv": [ 0, 0, - 2.0, - 2.0 + 1.4108833751047953, + 1.4108833751047953 ], "texture": "#white" }, @@ -100,8 +103,8 @@ "uv": [ 0, 0, - 2.0, - 2.0 + 1.4108833751047953, + 1.4108833751047953 ], "texture": "#white" }, @@ -109,8 +112,8 @@ "uv": [ 0, 0, - 2.0, - 2.0 + 2.273333333333335, + 1.4108833751047953 ], "texture": "#white" }, @@ -118,8 +121,8 @@ "uv": [ 0, 0, - 2.0, - 2.0 + 2.273333333333335, + 1.4108833751047953 ], "texture": "#white" }, @@ -127,8 +130,8 @@ "uv": [ 0, 0, - 2.0, - 2.0 + 1.4108833751047953, + 2.273333333333335 ], "texture": "#white" }, @@ -136,31 +139,40 @@ "uv": [ 0, 0, - 2.0, - 2.0 + 1.4108833751047953, + 2.273333333333335 ], "texture": "#white" } + }, + "rotation": { + "angle": 45, + "axis": "z", + "origin": [ + 8.0, + 8.0, + -14.833333333333332 + ] } }, { "from": [ - 6.666666666666666, - 6.666666666666666, - -12.0 + 6.8507775398726425, + 6.8507775398726425, + -13.666666666666666 ], "to": [ - 9.333333333333334, - 9.333333333333334, - -10.0 + 9.149222460127358, + 9.149222460127358, + -11.333333333333332 ], "faces": { "north": { "uv": [ 0, 0, - 2.666666666666668, - 2.666666666666668 + 2.298444920254716, + 2.298444920254716 ], "texture": "#white" }, @@ -168,8 +180,8 @@ "uv": [ 0, 0, - 2.666666666666668, - 2.666666666666668 + 2.298444920254716, + 2.298444920254716 ], "texture": "#white" }, @@ -177,8 +189,8 @@ "uv": [ 0, 0, - 2.0, - 2.666666666666668 + 2.333333333333334, + 2.298444920254716 ], "texture": "#white" }, @@ -186,8 +198,8 @@ "uv": [ 0, 0, - 2.0, - 2.666666666666668 + 2.333333333333334, + 2.298444920254716 ], "texture": "#white" }, @@ -195,8 +207,8 @@ "uv": [ 0, 0, - 2.666666666666668, - 2.0 + 2.298444920254716, + 2.333333333333334 ], "texture": "#white" }, @@ -204,8 +216,8 @@ "uv": [ 0, 0, - 2.666666666666668, - 2.0 + 2.298444920254716, + 2.333333333333334 ], "texture": "#white" } @@ -213,22 +225,22 @@ }, { "from": [ - 6.5, - 6.5, - -10.0 + 6.8507775398726425, + 6.8507775398726425, + -13.636666666666667 ], "to": [ - 9.5, - 9.5, - 24.0 + 9.149222460127358, + 9.149222460127358, + -11.363333333333332 ], "faces": { "north": { "uv": [ 0, 0, - 3.0, - 3.0 + 2.298444920254716, + 2.298444920254716 ], "texture": "#white" }, @@ -236,67 +248,366 @@ "uv": [ 0, 0, - 3.0, - 3.0 + 2.298444920254716, + 2.298444920254716 ], "texture": "#white" }, + "east": { + "uv": [ + 0, + 0, + 2.273333333333335, + 2.298444920254716 + ], + "texture": "#white" + }, + "west": { + "uv": [ + 0, + 0, + 2.273333333333335, + 2.298444920254716 + ], + "texture": "#white" + }, + "up": { + "uv": [ + 0, + 0, + 2.298444920254716, + 2.273333333333335 + ], + "texture": "#white" + }, + "down": { + "uv": [ + 0, + 0, + 2.298444920254716, + 2.273333333333335 + ], + "texture": "#white" + } + }, + "rotation": { + "angle": 45, + "axis": "z", + "origin": [ + 8.0, + 8.0, + -12.5 + ] + } + }, + { + "from": [ + 6.517798430927714, + 6.517798430927714, + -11.333333333333332 + ], + "to": [ + 9.482201569072286, + 9.482201569072286, + -9.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 2.964403138144572, + 2.964403138144572 + ], + "texture": "#white" + }, + "south": { + "uv": [ + 0, + 0, + 2.964403138144572, + 2.964403138144572 + ], + "texture": "#white" + }, + "east": { + "uv": [ + 0, + 0, + 2.333333333333332, + 2.964403138144572 + ], + "texture": "#white" + }, + "west": { + "uv": [ + 0, + 0, + 2.333333333333332, + 2.964403138144572 + ], + "texture": "#white" + }, + "up": { + "uv": [ + 0, + 0, + 2.964403138144572, + 2.333333333333332 + ], + "texture": "#white" + }, + "down": { + "uv": [ + 0, + 0, + 2.964403138144572, + 2.333333333333332 + ], + "texture": "#white" + } + } + }, + { + "from": [ + 6.517798430927714, + 6.517798430927714, + -11.303333333333333 + ], + "to": [ + 9.482201569072286, + 9.482201569072286, + -9.03 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 2.964403138144572, + 2.964403138144572 + ], + "texture": "#white" + }, + "south": { + "uv": [ + 0, + 0, + 2.964403138144572, + 2.964403138144572 + ], + "texture": "#white" + }, + "east": { + "uv": [ + 0, + 0, + 2.2733333333333334, + 2.964403138144572 + ], + "texture": "#white" + }, + "west": { + "uv": [ + 0, + 0, + 2.2733333333333334, + 2.964403138144572 + ], + "texture": "#white" + }, + "up": { + "uv": [ + 0, + 0, + 2.964403138144572, + 2.2733333333333334 + ], + "texture": "#white" + }, + "down": { + "uv": [ + 0, + 0, + 2.964403138144572, + 2.2733333333333334 + ], + "texture": "#white" + } + }, + "rotation": { + "angle": 45, + "axis": "z", + "origin": [ + 8.0, + 8.0, + -10.166666666666666 + ] + } + }, + { + "from": [ + 6.4293700000000005, + 6.4293700000000005, + -9.0 + ], + "to": [ + 9.57063, + 9.57063, + 22.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.141259999999999, + 3.141259999999999 + ], + "texture": "#rm_white" + }, + "south": { + "uv": [ + 0, + 0, + 3.141259999999999, + 3.141259999999999 + ], + "texture": "#rm_white" + }, "east": { "uv": [ 0, 0, 16, - 3.0 + 3.141259999999999 ], - "texture": "#white" + "texture": "#rm_white" }, "west": { "uv": [ 0, 0, 16, - 3.0 + 3.141259999999999 ], - "texture": "#white" + "texture": "#rm_white" }, "up": { "uv": [ 0, 0, - 3.0, + 3.141259999999999, 16 ], - "texture": "#white" + "texture": "#rm_white_t" }, "down": { "uv": [ 0, 0, - 3.0, + 3.141259999999999, 16 ], - "texture": "#white" + "texture": "#rm_white_t" } } }, { "from": [ - 3.0, - 7.6, - -9.0 + 6.4293700000000005, + 6.4293700000000005, + -8.97 ], "to": [ - 6.5, - 8.4, - -5.0 + 9.57063, + 9.57063, + 21.97 ], "faces": { "north": { "uv": [ 0, 0, - 3.5, - 0.8000000000000007 + 3.141259999999999, + 3.141259999999999 + ], + "texture": "#rm_white" + }, + "south": { + "uv": [ + 0, + 0, + 3.141259999999999, + 3.141259999999999 + ], + "texture": "#rm_white" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 3.141259999999999 + ], + "texture": "#rm_white" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 3.141259999999999 + ], + "texture": "#rm_white" + }, + "up": { + "uv": [ + 0, + 0, + 3.141259999999999, + 16 + ], + "texture": "#rm_white_t" + }, + "down": { + "uv": [ + 0, + 0, + 3.141259999999999, + 16 + ], + "texture": "#rm_white_t" + } + }, + "rotation": { + "angle": 45, + "axis": "z", + "origin": [ + 8.0, + 8.0, + 6.499999999999999 + ] + } + }, + { + "from": [ + 9.53, + 7.65, + -8.0 + ], + "to": [ + 11.51, + 8.35, + -5.5 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 1.9800000000000004, + 0.6999999999999993 ], "texture": "#missile_grey" }, @@ -304,8 +615,8 @@ "uv": [ 0, 0, - 3.5, - 0.8000000000000007 + 1.9800000000000004, + 0.6999999999999993 ], "texture": "#missile_grey" }, @@ -313,8 +624,8 @@ "uv": [ 0, 0, - 4.0, - 0.8000000000000007 + 2.5, + 0.6999999999999993 ], "texture": "#missile_grey" }, @@ -322,8 +633,8 @@ "uv": [ 0, 0, - 4.0, - 0.8000000000000007 + 2.5, + 0.6999999999999993 ], "texture": "#missile_grey" }, @@ -331,8 +642,8 @@ "uv": [ 0, 0, - 3.5, - 4.0 + 1.9800000000000004, + 2.5 ], "texture": "#missile_grey" }, @@ -340,8 +651,8 @@ "uv": [ 0, 0, - 3.5, - 4.0 + 1.9800000000000004, + 2.5 ], "texture": "#missile_grey" } @@ -349,22 +660,22 @@ }, { "from": [ - 9.5, - 7.6, - -9.0 + 4.49, + 7.65, + -8.0 ], "to": [ - 13.0, - 8.4, - -5.0 + 6.470000000000001, + 8.35, + -5.5 ], "faces": { "north": { "uv": [ 0, 0, - 3.5, - 0.8000000000000007 + 1.9800000000000004, + 0.6999999999999993 ], "texture": "#missile_grey" }, @@ -372,8 +683,8 @@ "uv": [ 0, 0, - 3.5, - 0.8000000000000007 + 1.9800000000000004, + 0.6999999999999993 ], "texture": "#missile_grey" }, @@ -381,8 +692,8 @@ "uv": [ 0, 0, - 4.0, - 0.8000000000000007 + 2.5, + 0.6999999999999993 ], "texture": "#missile_grey" }, @@ -390,8 +701,8 @@ "uv": [ 0, 0, - 4.0, - 0.8000000000000007 + 2.5, + 0.6999999999999993 ], "texture": "#missile_grey" }, @@ -399,8 +710,8 @@ "uv": [ 0, 0, - 3.5, - 4.0 + 1.9800000000000004, + 2.5 ], "texture": "#missile_grey" }, @@ -408,8 +719,8 @@ "uv": [ 0, 0, - 3.5, - 4.0 + 1.9800000000000004, + 2.5 ], "texture": "#missile_grey" } @@ -417,22 +728,22 @@ }, { "from": [ - 7.6, - 3.0, - -9.0 + 11.51, + 7.65, + -7.0 ], "to": [ - 8.4, - 6.5, - -5.0 + 13.129999999999999, + 8.35, + -5.5 ], "faces": { "north": { "uv": [ 0, 0, - 0.8000000000000007, - 3.5 + 1.6199999999999992, + 0.6999999999999993 ], "texture": "#missile_grey" }, @@ -440,8 +751,8 @@ "uv": [ 0, 0, - 0.8000000000000007, - 3.5 + 1.6199999999999992, + 0.6999999999999993 ], "texture": "#missile_grey" }, @@ -449,8 +760,8 @@ "uv": [ 0, 0, - 4.0, - 3.5 + 1.5, + 0.6999999999999993 ], "texture": "#missile_grey" }, @@ -458,8 +769,8 @@ "uv": [ 0, 0, - 4.0, - 3.5 + 1.5, + 0.6999999999999993 ], "texture": "#missile_grey" }, @@ -467,8 +778,8 @@ "uv": [ 0, 0, - 0.8000000000000007, - 4.0 + 1.6199999999999992, + 1.5 ], "texture": "#missile_grey" }, @@ -476,8 +787,8 @@ "uv": [ 0, 0, - 0.8000000000000007, - 4.0 + 1.6199999999999992, + 1.5 ], "texture": "#missile_grey" } @@ -485,22 +796,22 @@ }, { "from": [ - 7.6, - 9.5, - -9.0 + 2.870000000000001, + 7.65, + -7.0 ], "to": [ - 8.4, - 13.0, - -5.0 + 4.49, + 8.35, + -5.5 ], "faces": { "north": { "uv": [ 0, 0, - 0.8000000000000007, - 3.5 + 1.6199999999999992, + 0.6999999999999993 ], "texture": "#missile_grey" }, @@ -508,8 +819,8 @@ "uv": [ 0, 0, - 0.8000000000000007, - 3.5 + 1.6199999999999992, + 0.6999999999999993 ], "texture": "#missile_grey" }, @@ -517,8 +828,8 @@ "uv": [ 0, 0, - 4.0, - 3.5 + 1.5, + 0.6999999999999993 ], "texture": "#missile_grey" }, @@ -526,8 +837,8 @@ "uv": [ 0, 0, - 4.0, - 3.5 + 1.5, + 0.6999999999999993 ], "texture": "#missile_grey" }, @@ -535,8 +846,8 @@ "uv": [ 0, 0, - 0.8000000000000007, - 4.0 + 1.6199999999999992, + 1.5 ], "texture": "#missile_grey" }, @@ -544,8 +855,8 @@ "uv": [ 0, 0, - 0.8000000000000007, - 4.0 + 1.6199999999999992, + 1.5 ], "texture": "#missile_grey" } @@ -553,22 +864,294 @@ }, { "from": [ - 2.0, - 7.6, - 18.0 + 7.65, + 9.53, + -8.0 ], "to": [ - 6.5, - 8.4, - 26.0 + 8.35, + 11.51, + -5.5 ], "faces": { "north": { "uv": [ 0, 0, - 4.5, - 0.8000000000000007 + 0.6999999999999993, + 1.9800000000000004 + ], + "texture": "#missile_grey" + }, + "south": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 1.9800000000000004 + ], + "texture": "#missile_grey" + }, + "east": { + "uv": [ + 0, + 0, + 2.5, + 1.9800000000000004 + ], + "texture": "#missile_grey" + }, + "west": { + "uv": [ + 0, + 0, + 2.5, + 1.9800000000000004 + ], + "texture": "#missile_grey" + }, + "up": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 2.5 + ], + "texture": "#missile_grey" + }, + "down": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 2.5 + ], + "texture": "#missile_grey" + } + } + }, + { + "from": [ + 7.65, + 11.51, + -7.0 + ], + "to": [ + 8.35, + 13.129999999999999, + -5.5 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 1.6199999999999992 + ], + "texture": "#missile_grey" + }, + "south": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 1.6199999999999992 + ], + "texture": "#missile_grey" + }, + "east": { + "uv": [ + 0, + 0, + 1.5, + 1.6199999999999992 + ], + "texture": "#missile_grey" + }, + "west": { + "uv": [ + 0, + 0, + 1.5, + 1.6199999999999992 + ], + "texture": "#missile_grey" + }, + "up": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 1.5 + ], + "texture": "#missile_grey" + }, + "down": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 1.5 + ], + "texture": "#missile_grey" + } + } + }, + { + "from": [ + 7.65, + 4.489999999999999, + -8.0 + ], + "to": [ + 8.35, + 6.47, + -5.5 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 1.9800000000000004 + ], + "texture": "#missile_grey" + }, + "south": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 1.9800000000000004 + ], + "texture": "#missile_grey" + }, + "east": { + "uv": [ + 0, + 0, + 2.5, + 1.9800000000000004 + ], + "texture": "#missile_grey" + }, + "west": { + "uv": [ + 0, + 0, + 2.5, + 1.9800000000000004 + ], + "texture": "#missile_grey" + }, + "up": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 2.5 + ], + "texture": "#missile_grey" + }, + "down": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 2.5 + ], + "texture": "#missile_grey" + } + } + }, + { + "from": [ + 7.65, + 2.8699999999999997, + -7.0 + ], + "to": [ + 8.35, + 4.489999999999999, + -5.5 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 1.6199999999999997 + ], + "texture": "#missile_grey" + }, + "south": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 1.6199999999999997 + ], + "texture": "#missile_grey" + }, + "east": { + "uv": [ + 0, + 0, + 1.5, + 1.6199999999999997 + ], + "texture": "#missile_grey" + }, + "west": { + "uv": [ + 0, + 0, + 1.5, + 1.6199999999999997 + ], + "texture": "#missile_grey" + }, + "up": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 1.5 + ], + "texture": "#missile_grey" + }, + "down": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 1.5 + ], + "texture": "#missile_grey" + } + } + }, + { + "from": [ + 9.53, + 7.65, + 16.0 + ], + "to": [ + 12.280000000000001, + 8.35, + 22.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 2.7500000000000018, + 0.6999999999999993 ], "texture": "#white" }, @@ -576,8 +1159,8 @@ "uv": [ 0, 0, - 4.5, - 0.8000000000000007 + 2.7500000000000018, + 0.6999999999999993 ], "texture": "#white" }, @@ -585,8 +1168,8 @@ "uv": [ 0, 0, - 8.0, - 0.8000000000000007 + 6.0, + 0.6999999999999993 ], "texture": "#white" }, @@ -594,8 +1177,8 @@ "uv": [ 0, 0, - 8.0, - 0.8000000000000007 + 6.0, + 0.6999999999999993 ], "texture": "#white" }, @@ -603,8 +1186,8 @@ "uv": [ 0, 0, - 4.5, - 8.0 + 2.7500000000000018, + 6.0 ], "texture": "#white" }, @@ -612,8 +1195,8 @@ "uv": [ 0, 0, - 4.5, - 8.0 + 2.7500000000000018, + 6.0 ], "texture": "#white" } @@ -621,22 +1204,22 @@ }, { "from": [ - 9.5, - 7.6, - 18.0 + 3.719999999999999, + 7.65, + 16.0 ], "to": [ - 14.0, - 8.4, - 26.0 + 6.470000000000001, + 8.35, + 22.0 ], "faces": { "north": { "uv": [ 0, 0, - 4.5, - 0.8000000000000007 + 2.7500000000000018, + 0.6999999999999993 ], "texture": "#white" }, @@ -644,8 +1227,8 @@ "uv": [ 0, 0, - 4.5, - 0.8000000000000007 + 2.7500000000000018, + 0.6999999999999993 ], "texture": "#white" }, @@ -653,8 +1236,8 @@ "uv": [ 0, 0, - 8.0, - 0.8000000000000007 + 6.0, + 0.6999999999999993 ], "texture": "#white" }, @@ -662,8 +1245,8 @@ "uv": [ 0, 0, - 8.0, - 0.8000000000000007 + 6.0, + 0.6999999999999993 ], "texture": "#white" }, @@ -671,8 +1254,8 @@ "uv": [ 0, 0, - 4.5, - 8.0 + 2.7500000000000018, + 6.0 ], "texture": "#white" }, @@ -680,8 +1263,8 @@ "uv": [ 0, 0, - 4.5, - 8.0 + 2.7500000000000018, + 6.0 ], "texture": "#white" } @@ -689,22 +1272,22 @@ }, { "from": [ - 7.6, - 2.0, - 18.0 + 12.280000000000001, + 7.65, + 19.5 ], "to": [ - 8.4, - 6.5, - 26.0 + 14.530000000000001, + 8.35, + 22.0 ], "faces": { "north": { "uv": [ 0, 0, - 0.8000000000000007, - 4.5 + 2.25, + 0.6999999999999993 ], "texture": "#white" }, @@ -712,8 +1295,8 @@ "uv": [ 0, 0, - 0.8000000000000007, - 4.5 + 2.25, + 0.6999999999999993 ], "texture": "#white" }, @@ -721,8 +1304,8 @@ "uv": [ 0, 0, - 8.0, - 4.5 + 2.5, + 0.6999999999999993 ], "texture": "#white" }, @@ -730,8 +1313,8 @@ "uv": [ 0, 0, - 8.0, - 4.5 + 2.5, + 0.6999999999999993 ], "texture": "#white" }, @@ -739,8 +1322,8 @@ "uv": [ 0, 0, - 0.8000000000000007, - 8.0 + 2.25, + 2.5 ], "texture": "#white" }, @@ -748,8 +1331,8 @@ "uv": [ 0, 0, - 0.8000000000000007, - 8.0 + 2.25, + 2.5 ], "texture": "#white" } @@ -757,22 +1340,22 @@ }, { "from": [ - 7.6, - 9.5, - 18.0 + 1.4699999999999989, + 7.65, + 19.5 ], "to": [ - 8.4, - 14.0, - 26.0 + 3.719999999999999, + 8.35, + 22.0 ], "faces": { "north": { "uv": [ 0, 0, - 0.8000000000000007, - 4.5 + 2.25, + 0.6999999999999993 ], "texture": "#white" }, @@ -780,8 +1363,8 @@ "uv": [ 0, 0, - 0.8000000000000007, - 4.5 + 2.25, + 0.6999999999999993 ], "texture": "#white" }, @@ -789,8 +1372,8 @@ "uv": [ 0, 0, - 8.0, - 4.5 + 2.5, + 0.6999999999999993 ], "texture": "#white" }, @@ -798,8 +1381,8 @@ "uv": [ 0, 0, - 8.0, - 4.5 + 2.5, + 0.6999999999999993 ], "texture": "#white" }, @@ -807,8 +1390,8 @@ "uv": [ 0, 0, - 0.8000000000000007, - 8.0 + 2.25, + 2.5 ], "texture": "#white" }, @@ -816,8 +1399,8 @@ "uv": [ 0, 0, - 0.8000000000000007, - 8.0 + 2.25, + 2.5 ], "texture": "#white" } @@ -825,69 +1408,409 @@ }, { "from": [ - 7.0, - 7.0, - 24.0 + 7.65, + 9.53, + 16.0 ], "to": [ - 9.0, - 9.0, - 28.0 + 8.35, + 12.28, + 22.0 ], "faces": { "north": { "uv": [ 0, 0, - 2.0, - 2.0 + 0.6999999999999993, + 2.75 ], - "texture": "#nozzle" + "texture": "#white" }, "south": { "uv": [ 0, 0, - 2.0, - 2.0 + 0.6999999999999993, + 2.75 ], - "texture": "#nozzle" + "texture": "#white" }, "east": { "uv": [ 0, 0, - 4.0, - 2.0 + 6.0, + 2.75 ], - "texture": "#nozzle" + "texture": "#white" }, "west": { "uv": [ 0, 0, - 4.0, - 2.0 + 6.0, + 2.75 ], - "texture": "#nozzle" + "texture": "#white" }, "up": { "uv": [ 0, 0, - 2.0, - 4.0 + 0.6999999999999993, + 6.0 ], - "texture": "#nozzle" + "texture": "#white" }, "down": { "uv": [ 0, 0, - 2.0, - 4.0 + 0.6999999999999993, + 6.0 ], - "texture": "#nozzle" + "texture": "#white" + } + } + }, + { + "from": [ + 7.65, + 12.28, + 19.5 + ], + "to": [ + 8.35, + 14.53, + 22.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 2.25 + ], + "texture": "#white" + }, + "south": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 2.25 + ], + "texture": "#white" + }, + "east": { + "uv": [ + 0, + 0, + 2.5, + 2.25 + ], + "texture": "#white" + }, + "west": { + "uv": [ + 0, + 0, + 2.5, + 2.25 + ], + "texture": "#white" + }, + "up": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 2.5 + ], + "texture": "#white" + }, + "down": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 2.5 + ], + "texture": "#white" + } + } + }, + { + "from": [ + 7.65, + 3.7199999999999998, + 16.0 + ], + "to": [ + 8.35, + 6.47, + 22.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 2.75 + ], + "texture": "#white" + }, + "south": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 2.75 + ], + "texture": "#white" + }, + "east": { + "uv": [ + 0, + 0, + 6.0, + 2.75 + ], + "texture": "#white" + }, + "west": { + "uv": [ + 0, + 0, + 6.0, + 2.75 + ], + "texture": "#white" + }, + "up": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 6.0 + ], + "texture": "#white" + }, + "down": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 6.0 + ], + "texture": "#white" + } + } + }, + { + "from": [ + 7.65, + 1.4699999999999998, + 19.5 + ], + "to": [ + 8.35, + 3.7199999999999998, + 22.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 2.25 + ], + "texture": "#white" + }, + "south": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 2.25 + ], + "texture": "#white" + }, + "east": { + "uv": [ + 0, + 0, + 2.5, + 2.25 + ], + "texture": "#white" + }, + "west": { + "uv": [ + 0, + 0, + 2.5, + 2.25 + ], + "texture": "#white" + }, + "up": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 2.5 + ], + "texture": "#white" + }, + "down": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 2.5 + ], + "texture": "#white" + } + } + }, + { + "from": [ + 6.64, + 6.64, + 22.0 + ], + "to": [ + 9.36, + 9.36, + 23.6 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 2.7199999999999998, + 2.7199999999999998 + ], + "texture": "#bare_nozzle" + }, + "south": { + "uv": [ + 0, + 0, + 2.7199999999999998, + 2.7199999999999998 + ], + "texture": "#bare_nozzle" + }, + "east": { + "uv": [ + 0, + 0, + 1.6000000000000014, + 2.7199999999999998 + ], + "texture": "#bare_nozzle" + }, + "west": { + "uv": [ + 0, + 0, + 1.6000000000000014, + 2.7199999999999998 + ], + "texture": "#bare_nozzle" + }, + "up": { + "uv": [ + 0, + 0, + 2.7199999999999998, + 1.6000000000000014 + ], + "texture": "#bare_nozzle" + }, + "down": { + "uv": [ + 0, + 0, + 2.7199999999999998, + 1.6000000000000014 + ], + "texture": "#bare_nozzle" + } + } + }, + { + "from": [ + 7.0649999999999995, + 7.0649999999999995, + 23.6 + ], + "to": [ + 8.935, + 8.935, + 23.9 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 1.870000000000001, + 1.870000000000001 + ], + "texture": "#glow_ember" + }, + "south": { + "uv": [ + 0, + 0, + 1.870000000000001, + 1.870000000000001 + ], + "texture": "#glow_ember" + }, + "east": { + "uv": [ + 0, + 0, + 0.29999999999999716, + 1.870000000000001 + ], + "texture": "#glow_ember" + }, + "west": { + "uv": [ + 0, + 0, + 0.29999999999999716, + 1.870000000000001 + ], + "texture": "#glow_ember" + }, + "up": { + "uv": [ + 0, + 0, + 1.870000000000001, + 0.29999999999999716 + ], + "texture": "#glow_ember" + }, + "down": { + "uv": [ + 0, + 0, + 1.870000000000001, + 0.29999999999999716 + ], + "texture": "#glow_ember" } } } diff --git a/airdef-mod/assets/airdef/models/block/irist_tubes.json b/airdef-mod/assets/airdef/models/block/irist_tubes.json index 973850b..77aa982 100644 --- a/airdef-mod/assets/airdef/models/block/irist_tubes.json +++ b/airdef-mod/assets/airdef/models/block/irist_tubes.json @@ -1,10 +1,10 @@ { "ambientocclusion": false, "textures": { - "canister": "airdef:block/canister", "tube_cap": "airdef:block/tube_cap", + "canister": "airdef:block/canister", "dark_metal": "airdef:block/dark_metal", - "particle": "airdef:block/canister" + "particle": "airdef:block/tube_cap" }, "elements": [ { diff --git a/airdef-mod/assets/airdef/models/block/irist_tubes_burnt.json b/airdef-mod/assets/airdef/models/block/irist_tubes_burnt.json new file mode 100644 index 0000000..a08e2d7 --- /dev/null +++ b/airdef-mod/assets/airdef/models/block/irist_tubes_burnt.json @@ -0,0 +1,691 @@ +{ + "ambientocclusion": false, + "textures": { + "tube_cap_b": "airdef:block/tube_cap_b", + "canister_b": "airdef:block/canister_b", + "dark_metal_b": "airdef:block/dark_metal_b", + "particle": "airdef:block/tube_cap_b" + }, + "elements": [ + { + "from": [ + -1.5, + 0.0, + -16.0 + ], + "to": [ + 2.5, + 4.0, + 32.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 4.0, + 4.0 + ], + "texture": "#tube_cap_b" + }, + "south": { + "uv": [ + 0, + 0, + 4.0, + 4.0 + ], + "texture": "#tube_cap_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#canister_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#canister_b" + }, + "up": { + "uv": [ + 0, + 0, + 4.0, + 16 + ], + "texture": "#canister_b" + }, + "down": { + "uv": [ + 0, + 0, + 4.0, + 16 + ], + "texture": "#canister_b" + } + } + }, + { + "from": [ + -1.5, + 5.0, + -16.0 + ], + "to": [ + 2.5, + 9.0, + 32.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 4.0, + 4.0 + ], + "texture": "#tube_cap_b" + }, + "south": { + "uv": [ + 0, + 0, + 4.0, + 4.0 + ], + "texture": "#tube_cap_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#canister_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#canister_b" + }, + "up": { + "uv": [ + 0, + 0, + 4.0, + 16 + ], + "texture": "#canister_b" + }, + "down": { + "uv": [ + 0, + 0, + 4.0, + 16 + ], + "texture": "#canister_b" + } + } + }, + { + "from": [ + 3.5, + 0.0, + -16.0 + ], + "to": [ + 7.5, + 4.0, + 32.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 4.0, + 4.0 + ], + "texture": "#tube_cap_b" + }, + "south": { + "uv": [ + 0, + 0, + 4.0, + 4.0 + ], + "texture": "#tube_cap_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#canister_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#canister_b" + }, + "up": { + "uv": [ + 0, + 0, + 4.0, + 16 + ], + "texture": "#canister_b" + }, + "down": { + "uv": [ + 0, + 0, + 4.0, + 16 + ], + "texture": "#canister_b" + } + } + }, + { + "from": [ + 3.5, + 5.0, + -16.0 + ], + "to": [ + 7.5, + 9.0, + 32.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 4.0, + 4.0 + ], + "texture": "#tube_cap_b" + }, + "south": { + "uv": [ + 0, + 0, + 4.0, + 4.0 + ], + "texture": "#tube_cap_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#canister_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#canister_b" + }, + "up": { + "uv": [ + 0, + 0, + 4.0, + 16 + ], + "texture": "#canister_b" + }, + "down": { + "uv": [ + 0, + 0, + 4.0, + 16 + ], + "texture": "#canister_b" + } + } + }, + { + "from": [ + 8.5, + 0.0, + -16.0 + ], + "to": [ + 12.5, + 4.0, + 32.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 4.0, + 4.0 + ], + "texture": "#tube_cap_b" + }, + "south": { + "uv": [ + 0, + 0, + 4.0, + 4.0 + ], + "texture": "#tube_cap_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#canister_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#canister_b" + }, + "up": { + "uv": [ + 0, + 0, + 4.0, + 16 + ], + "texture": "#canister_b" + }, + "down": { + "uv": [ + 0, + 0, + 4.0, + 16 + ], + "texture": "#canister_b" + } + } + }, + { + "from": [ + 8.5, + 5.0, + -16.0 + ], + "to": [ + 12.5, + 9.0, + 32.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 4.0, + 4.0 + ], + "texture": "#tube_cap_b" + }, + "south": { + "uv": [ + 0, + 0, + 4.0, + 4.0 + ], + "texture": "#tube_cap_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#canister_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#canister_b" + }, + "up": { + "uv": [ + 0, + 0, + 4.0, + 16 + ], + "texture": "#canister_b" + }, + "down": { + "uv": [ + 0, + 0, + 4.0, + 16 + ], + "texture": "#canister_b" + } + } + }, + { + "from": [ + 13.5, + 0.0, + -16.0 + ], + "to": [ + 17.5, + 4.0, + 32.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 4.0, + 4.0 + ], + "texture": "#tube_cap_b" + }, + "south": { + "uv": [ + 0, + 0, + 4.0, + 4.0 + ], + "texture": "#tube_cap_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#canister_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#canister_b" + }, + "up": { + "uv": [ + 0, + 0, + 4.0, + 16 + ], + "texture": "#canister_b" + }, + "down": { + "uv": [ + 0, + 0, + 4.0, + 16 + ], + "texture": "#canister_b" + } + } + }, + { + "from": [ + 13.5, + 5.0, + -16.0 + ], + "to": [ + 17.5, + 9.0, + 32.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 4.0, + 4.0 + ], + "texture": "#tube_cap_b" + }, + "south": { + "uv": [ + 0, + 0, + 4.0, + 4.0 + ], + "texture": "#tube_cap_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#canister_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#canister_b" + }, + "up": { + "uv": [ + 0, + 0, + 4.0, + 16 + ], + "texture": "#canister_b" + }, + "down": { + "uv": [ + 0, + 0, + 4.0, + 16 + ], + "texture": "#canister_b" + } + } + }, + { + "from": [ + -2.5, + 0.0, + 26.0 + ], + "to": [ + 18.5, + 9.0, + 28.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 9.0 + ], + "texture": "#dark_metal_b" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 9.0 + ], + "texture": "#dark_metal_b" + }, + "east": { + "uv": [ + 0, + 0, + 2.0, + 9.0 + ], + "texture": "#dark_metal_b" + }, + "west": { + "uv": [ + 0, + 0, + 2.0, + 9.0 + ], + "texture": "#dark_metal_b" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 2.0 + ], + "texture": "#dark_metal_b" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 2.0 + ], + "texture": "#dark_metal_b" + } + } + }, + { + "from": [ + -2.5, + 0.0, + -2.0 + ], + "to": [ + 18.5, + 9.0, + 0.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 9.0 + ], + "texture": "#dark_metal_b" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 9.0 + ], + "texture": "#dark_metal_b" + }, + "east": { + "uv": [ + 0, + 0, + 2.0, + 9.0 + ], + "texture": "#dark_metal_b" + }, + "west": { + "uv": [ + 0, + 0, + 2.0, + 9.0 + ], + "texture": "#dark_metal_b" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 2.0 + ], + "texture": "#dark_metal_b" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 2.0 + ], + "texture": "#dark_metal_b" + } + } + } + ] +} \ No newline at end of file diff --git a/airdef-mod/assets/airdef/models/block/iskander.json b/airdef-mod/assets/airdef/models/block/iskander.json index d58530d..09e9766 100644 --- a/airdef-mod/assets/airdef/models/block/iskander.json +++ b/airdef-mod/assets/airdef/models/block/iskander.json @@ -1,438 +1,1048 @@ { "ambientocclusion": false, "textures": { - "ru_khaki": "airdef:block/ru_khaki", + "rm_khaki": "airdef:block/rm_khaki", + "rm_khaki_t": "airdef:block/rm_khaki_t", "dark_metal": "airdef:block/dark_metal", - "nozzle": "airdef:block/nozzle", - "particle": "airdef:block/ru_khaki" + "ru_khaki": "airdef:block/ru_khaki", + "bare_nozzle": "airdef:block/bare_nozzle", + "glow_ember": "airdef:block/glow_ember", + "particle": "airdef:block/rm_khaki" }, "elements": [ { "from": [ - 6.975, - 6.975, + 6.979652271070121, + 6.979652271070121, -16.0 ], "to": [ - 9.025, - 9.025, - -14.0 + 9.02034772892988, + 9.02034772892988, + -14.166666666666666 ], "faces": { "north": { "uv": [ 0, 0, - 2.0500000000000007, - 2.0500000000000007 + 2.0406954578597585, + 2.0406954578597585 ], - "texture": "#ru_khaki" + "texture": "#rm_khaki" }, "south": { "uv": [ 0, 0, - 2.0500000000000007, - 2.0500000000000007 + 2.0406954578597585, + 2.0406954578597585 ], - "texture": "#ru_khaki" + "texture": "#rm_khaki" }, "east": { "uv": [ 0, 0, - 2.0, - 2.0500000000000007 + 1.833333333333334, + 2.0406954578597585 ], - "texture": "#ru_khaki" + "texture": "#rm_khaki" }, "west": { "uv": [ 0, 0, - 2.0, - 2.0500000000000007 + 1.833333333333334, + 2.0406954578597585 ], - "texture": "#ru_khaki" + "texture": "#rm_khaki" }, "up": { "uv": [ 0, 0, - 2.0500000000000007, - 2.0 + 2.0406954578597585, + 1.833333333333334 ], - "texture": "#ru_khaki" + "texture": "#rm_khaki_t" }, "down": { "uv": [ 0, 0, - 2.0500000000000007, - 2.0 + 2.0406954578597585, + 1.833333333333334 ], - "texture": "#ru_khaki" + "texture": "#rm_khaki_t" } } }, { "from": [ - 6.425, - 6.425, - -14.0 + 6.979652271070121, + 6.979652271070121, + -15.97 ], "to": [ - 9.575, - 9.575, - -12.0 + 9.02034772892988, + 9.02034772892988, + -14.196666666666665 ], "faces": { "north": { "uv": [ 0, 0, - 3.1499999999999995, - 3.1499999999999995 + 2.0406954578597585, + 2.0406954578597585 ], - "texture": "#ru_khaki" + "texture": "#rm_khaki" }, "south": { "uv": [ 0, 0, - 3.1499999999999995, - 3.1499999999999995 + 2.0406954578597585, + 2.0406954578597585 ], - "texture": "#ru_khaki" + "texture": "#rm_khaki" }, "east": { "uv": [ 0, 0, - 2.0, - 3.1499999999999995 + 1.7733333333333352, + 2.0406954578597585 ], - "texture": "#ru_khaki" + "texture": "#rm_khaki" }, "west": { "uv": [ 0, 0, - 2.0, - 3.1499999999999995 + 1.7733333333333352, + 2.0406954578597585 ], - "texture": "#ru_khaki" + "texture": "#rm_khaki" }, "up": { "uv": [ 0, 0, - 3.1499999999999995, - 2.0 + 2.0406954578597585, + 1.7733333333333352 ], - "texture": "#ru_khaki" + "texture": "#rm_khaki_t" }, "down": { "uv": [ 0, 0, - 3.1499999999999995, - 2.0 + 2.0406954578597585, + 1.7733333333333352 ], - "texture": "#ru_khaki" + "texture": "#rm_khaki_t" } + }, + "rotation": { + "angle": 45, + "axis": "z", + "origin": [ + 8.0, + 8.0, + -15.083333333333332 + ] } }, { "from": [ - 5.875, - 5.875, - -12.0 + 6.33776972935263, + 6.33776972935263, + -14.166666666666666 ], "to": [ - 10.125, - 10.125, - -10.0 + 9.66223027064737, + 9.66223027064737, + -12.333333333333334 ], "faces": { "north": { "uv": [ 0, 0, - 4.25, - 4.25 + 3.324460541294741, + 3.324460541294741 ], - "texture": "#ru_khaki" + "texture": "#rm_khaki" }, "south": { "uv": [ 0, 0, - 4.25, - 4.25 + 3.324460541294741, + 3.324460541294741 ], - "texture": "#ru_khaki" + "texture": "#rm_khaki" }, "east": { "uv": [ 0, 0, - 2.0, - 4.25 + 1.8333333333333321, + 3.324460541294741 ], - "texture": "#ru_khaki" + "texture": "#rm_khaki" }, "west": { "uv": [ 0, 0, - 2.0, - 4.25 + 1.8333333333333321, + 3.324460541294741 ], - "texture": "#ru_khaki" + "texture": "#rm_khaki" }, "up": { "uv": [ 0, 0, - 4.25, - 2.0 + 3.324460541294741, + 1.8333333333333321 ], - "texture": "#ru_khaki" + "texture": "#rm_khaki_t" }, "down": { "uv": [ 0, 0, - 4.25, - 2.0 + 3.324460541294741, + 1.8333333333333321 ], - "texture": "#ru_khaki" + "texture": "#rm_khaki_t" } } }, { "from": [ - 5.325, - 5.325, - -10.0 + 6.33776972935263, + 6.33776972935263, + -14.136666666666667 ], "to": [ - 10.675, - 10.675, - -8.0 + 9.66223027064737, + 9.66223027064737, + -12.363333333333333 ], "faces": { "north": { "uv": [ 0, 0, - 5.3500000000000005, - 5.3500000000000005 + 3.324460541294741, + 3.324460541294741 ], - "texture": "#ru_khaki" + "texture": "#rm_khaki" }, "south": { "uv": [ 0, 0, - 5.3500000000000005, - 5.3500000000000005 + 3.324460541294741, + 3.324460541294741 ], - "texture": "#ru_khaki" + "texture": "#rm_khaki" }, "east": { "uv": [ 0, 0, - 2.0, - 5.3500000000000005 + 1.7733333333333334, + 3.324460541294741 ], - "texture": "#ru_khaki" + "texture": "#rm_khaki" }, "west": { "uv": [ 0, 0, - 2.0, - 5.3500000000000005 + 1.7733333333333334, + 3.324460541294741 ], - "texture": "#ru_khaki" + "texture": "#rm_khaki" }, "up": { "uv": [ 0, 0, - 5.3500000000000005, - 2.0 + 3.324460541294741, + 1.7733333333333334 ], - "texture": "#ru_khaki" + "texture": "#rm_khaki_t" }, "down": { "uv": [ 0, 0, - 5.3500000000000005, - 2.0 + 3.324460541294741, + 1.7733333333333334 ], - "texture": "#ru_khaki" + "texture": "#rm_khaki_t" } + }, + "rotation": { + "angle": 45, + "axis": "z", + "origin": [ + 8.0, + 8.0, + -13.25 + ] } }, { "from": [ - 4.775, - 4.775, - -8.0 + 5.856150222612298, + 5.856150222612298, + -12.333333333333334 ], "to": [ - 11.225, - 11.225, - -6.0 + 10.143849777387702, + 10.143849777387702, + -10.5 ], "faces": { "north": { "uv": [ 0, 0, - 6.449999999999999, - 6.449999999999999 + 4.287699554775404, + 4.287699554775404 ], - "texture": "#ru_khaki" + "texture": "#rm_khaki" }, "south": { "uv": [ 0, 0, - 6.449999999999999, - 6.449999999999999 + 4.287699554775404, + 4.287699554775404 ], - "texture": "#ru_khaki" + "texture": "#rm_khaki" }, "east": { "uv": [ 0, 0, - 2.0, - 6.449999999999999 + 1.833333333333334, + 4.287699554775404 ], - "texture": "#ru_khaki" + "texture": "#rm_khaki" }, "west": { "uv": [ 0, 0, - 2.0, - 6.449999999999999 + 1.833333333333334, + 4.287699554775404 ], - "texture": "#ru_khaki" + "texture": "#rm_khaki" }, "up": { "uv": [ 0, 0, - 6.449999999999999, - 2.0 + 4.287699554775404, + 1.833333333333334 ], - "texture": "#ru_khaki" + "texture": "#rm_khaki_t" }, "down": { "uv": [ 0, 0, - 6.449999999999999, - 2.0 + 4.287699554775404, + 1.833333333333334 ], - "texture": "#ru_khaki" + "texture": "#rm_khaki_t" } } }, { "from": [ - 4.5, - 4.5, - -6.0 + 5.856150222612298, + 5.856150222612298, + -12.303333333333335 ], "to": [ - 11.5, - 11.5, - 30.0 + 10.143849777387702, + 10.143849777387702, + -10.53 ], "faces": { "north": { "uv": [ 0, 0, - 7.0, - 7.0 + 4.287699554775404, + 4.287699554775404 ], - "texture": "#ru_khaki" + "texture": "#rm_khaki" }, "south": { "uv": [ 0, 0, - 7.0, - 7.0 + 4.287699554775404, + 4.287699554775404 ], - "texture": "#ru_khaki" + "texture": "#rm_khaki" + }, + "east": { + "uv": [ + 0, + 0, + 1.7733333333333352, + 4.287699554775404 + ], + "texture": "#rm_khaki" + }, + "west": { + "uv": [ + 0, + 0, + 1.7733333333333352, + 4.287699554775404 + ], + "texture": "#rm_khaki" + }, + "up": { + "uv": [ + 0, + 0, + 4.287699554775404, + 1.7733333333333352 + ], + "texture": "#rm_khaki_t" + }, + "down": { + "uv": [ + 0, + 0, + 4.287699554775404, + 1.7733333333333352 + ], + "texture": "#rm_khaki_t" + } + }, + "rotation": { + "angle": 45, + "axis": "z", + "origin": [ + 8.0, + 8.0, + -11.416666666666668 + ] + } + }, + { + "from": [ + 5.450498754885794, + 5.450498754885794, + -10.5 + ], + "to": [ + 10.549501245114206, + 10.549501245114206, + -8.666666666666668 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 5.099002490228411, + 5.099002490228411 + ], + "texture": "#rm_khaki" + }, + "south": { + "uv": [ + 0, + 0, + 5.099002490228411, + 5.099002490228411 + ], + "texture": "#rm_khaki" + }, + "east": { + "uv": [ + 0, + 0, + 1.8333333333333321, + 5.099002490228411 + ], + "texture": "#rm_khaki" + }, + "west": { + "uv": [ + 0, + 0, + 1.8333333333333321, + 5.099002490228411 + ], + "texture": "#rm_khaki" + }, + "up": { + "uv": [ + 0, + 0, + 5.099002490228411, + 1.8333333333333321 + ], + "texture": "#rm_khaki_t" + }, + "down": { + "uv": [ + 0, + 0, + 5.099002490228411, + 1.8333333333333321 + ], + "texture": "#rm_khaki_t" + } + } + }, + { + "from": [ + 5.450498754885794, + 5.450498754885794, + -10.47 + ], + "to": [ + 10.549501245114206, + 10.549501245114206, + -8.696666666666667 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 5.099002490228411, + 5.099002490228411 + ], + "texture": "#rm_khaki" + }, + "south": { + "uv": [ + 0, + 0, + 5.099002490228411, + 5.099002490228411 + ], + "texture": "#rm_khaki" + }, + "east": { + "uv": [ + 0, + 0, + 1.7733333333333334, + 5.099002490228411 + ], + "texture": "#rm_khaki" + }, + "west": { + "uv": [ + 0, + 0, + 1.7733333333333334, + 5.099002490228411 + ], + "texture": "#rm_khaki" + }, + "up": { + "uv": [ + 0, + 0, + 5.099002490228411, + 1.7733333333333334 + ], + "texture": "#rm_khaki_t" + }, + "down": { + "uv": [ + 0, + 0, + 5.099002490228411, + 1.7733333333333334 + ], + "texture": "#rm_khaki_t" + } + }, + "rotation": { + "angle": 45, + "axis": "z", + "origin": [ + 8.0, + 8.0, + -9.583333333333334 + ] + } + }, + { + "from": [ + 5.091975226050024, + 5.091975226050024, + -8.666666666666668 + ], + "to": [ + 10.908024773949975, + 10.908024773949975, + -6.833333333333334 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 5.816049547899952, + 5.816049547899952 + ], + "texture": "#rm_khaki" + }, + "south": { + "uv": [ + 0, + 0, + 5.816049547899952, + 5.816049547899952 + ], + "texture": "#rm_khaki" + }, + "east": { + "uv": [ + 0, + 0, + 1.833333333333334, + 5.816049547899952 + ], + "texture": "#rm_khaki" + }, + "west": { + "uv": [ + 0, + 0, + 1.833333333333334, + 5.816049547899952 + ], + "texture": "#rm_khaki" + }, + "up": { + "uv": [ + 0, + 0, + 5.816049547899952, + 1.833333333333334 + ], + "texture": "#rm_khaki_t" + }, + "down": { + "uv": [ + 0, + 0, + 5.816049547899952, + 1.833333333333334 + ], + "texture": "#rm_khaki_t" + } + } + }, + { + "from": [ + 5.091975226050024, + 5.091975226050024, + -8.636666666666668 + ], + "to": [ + 10.908024773949975, + 10.908024773949975, + -6.863333333333334 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 5.816049547899952, + 5.816049547899952 + ], + "texture": "#rm_khaki" + }, + "south": { + "uv": [ + 0, + 0, + 5.816049547899952, + 5.816049547899952 + ], + "texture": "#rm_khaki" + }, + "east": { + "uv": [ + 0, + 0, + 1.7733333333333343, + 5.816049547899952 + ], + "texture": "#rm_khaki" + }, + "west": { + "uv": [ + 0, + 0, + 1.7733333333333343, + 5.816049547899952 + ], + "texture": "#rm_khaki" + }, + "up": { + "uv": [ + 0, + 0, + 5.816049547899952, + 1.7733333333333343 + ], + "texture": "#rm_khaki_t" + }, + "down": { + "uv": [ + 0, + 0, + 5.816049547899952, + 1.7733333333333343 + ], + "texture": "#rm_khaki_t" + } + }, + "rotation": { + "angle": 45, + "axis": "z", + "origin": [ + 8.0, + 8.0, + -7.750000000000002 + ] + } + }, + { + "from": [ + 4.766480749821159, + 4.766480749821159, + -6.833333333333334 + ], + "to": [ + 11.23351925017884, + 11.23351925017884, + -5.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 6.467038500357681, + 6.467038500357681 + ], + "texture": "#rm_khaki" + }, + "south": { + "uv": [ + 0, + 0, + 6.467038500357681, + 6.467038500357681 + ], + "texture": "#rm_khaki" + }, + "east": { + "uv": [ + 0, + 0, + 1.833333333333334, + 6.467038500357681 + ], + "texture": "#rm_khaki" + }, + "west": { + "uv": [ + 0, + 0, + 1.833333333333334, + 6.467038500357681 + ], + "texture": "#rm_khaki" + }, + "up": { + "uv": [ + 0, + 0, + 6.467038500357681, + 1.833333333333334 + ], + "texture": "#rm_khaki_t" + }, + "down": { + "uv": [ + 0, + 0, + 6.467038500357681, + 1.833333333333334 + ], + "texture": "#rm_khaki_t" + } + } + }, + { + "from": [ + 4.766480749821159, + 4.766480749821159, + -6.803333333333334 + ], + "to": [ + 11.23351925017884, + 11.23351925017884, + -5.03 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 6.467038500357681, + 6.467038500357681 + ], + "texture": "#rm_khaki" + }, + "south": { + "uv": [ + 0, + 0, + 6.467038500357681, + 6.467038500357681 + ], + "texture": "#rm_khaki" + }, + "east": { + "uv": [ + 0, + 0, + 1.7733333333333334, + 6.467038500357681 + ], + "texture": "#rm_khaki" + }, + "west": { + "uv": [ + 0, + 0, + 1.7733333333333334, + 6.467038500357681 + ], + "texture": "#rm_khaki" + }, + "up": { + "uv": [ + 0, + 0, + 6.467038500357681, + 1.7733333333333334 + ], + "texture": "#rm_khaki_t" + }, + "down": { + "uv": [ + 0, + 0, + 6.467038500357681, + 1.7733333333333334 + ], + "texture": "#rm_khaki_t" + } + }, + "rotation": { + "angle": 45, + "axis": "z", + "origin": [ + 8.0, + 8.0, + -5.916666666666667 + ] + } + }, + { + "from": [ + 4.673959999999999, + 4.673959999999999, + -5.0 + ], + "to": [ + 11.32604, + 11.32604, + 28.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 6.6520800000000015, + 6.6520800000000015 + ], + "texture": "#rm_khaki" + }, + "south": { + "uv": [ + 0, + 0, + 6.6520800000000015, + 6.6520800000000015 + ], + "texture": "#rm_khaki" }, "east": { "uv": [ 0, 0, 16, - 7.0 + 6.6520800000000015 ], - "texture": "#ru_khaki" + "texture": "#rm_khaki" }, "west": { "uv": [ 0, 0, 16, - 7.0 + 6.6520800000000015 ], - "texture": "#ru_khaki" + "texture": "#rm_khaki" }, "up": { "uv": [ 0, 0, - 7.0, + 6.6520800000000015, 16 ], - "texture": "#ru_khaki" + "texture": "#rm_khaki_t" }, "down": { "uv": [ 0, 0, - 7.0, + 6.6520800000000015, 16 ], - "texture": "#ru_khaki" + "texture": "#rm_khaki_t" } } }, { "from": [ - 4.4, - 4.4, + 4.673959999999999, + 4.673959999999999, + -4.97 + ], + "to": [ + 11.32604, + 11.32604, + 27.97 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 6.6520800000000015, + 6.6520800000000015 + ], + "texture": "#rm_khaki" + }, + "south": { + "uv": [ + 0, + 0, + 6.6520800000000015, + 6.6520800000000015 + ], + "texture": "#rm_khaki" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 6.6520800000000015 + ], + "texture": "#rm_khaki" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 6.6520800000000015 + ], + "texture": "#rm_khaki" + }, + "up": { + "uv": [ + 0, + 0, + 6.6520800000000015, + 16 + ], + "texture": "#rm_khaki_t" + }, + "down": { + "uv": [ + 0, + 0, + 6.6520800000000015, + 16 + ], + "texture": "#rm_khaki_t" + } + }, + "rotation": { + "angle": 45, + "axis": "z", + "origin": [ + 8.0, + 8.0, + 11.5 + ] + } + }, + { + "from": [ + 4.48918, + 4.48918, + 3.0 + ], + "to": [ + 11.510819999999999, + 11.510819999999999, 4.0 ], - "to": [ - 11.6, - 11.6, - 5.0 - ], "faces": { "north": { "uv": [ 0, 0, - 7.199999999999999, - 7.199999999999999 + 7.021639999999999, + 7.021639999999999 ], "texture": "#dark_metal" }, @@ -440,8 +1050,8 @@ "uv": [ 0, 0, - 7.199999999999999, - 7.199999999999999 + 7.021639999999999, + 7.021639999999999 ], "texture": "#dark_metal" }, @@ -450,7 +1060,7 @@ 0, 0, 1.0, - 7.199999999999999 + 7.021639999999999 ], "texture": "#dark_metal" }, @@ -459,7 +1069,7 @@ 0, 0, 1.0, - 7.199999999999999 + 7.021639999999999 ], "texture": "#dark_metal" }, @@ -467,7 +1077,7 @@ "uv": [ 0, 0, - 7.199999999999999, + 7.021639999999999, 1.0 ], "texture": "#dark_metal" @@ -476,7 +1086,7 @@ "uv": [ 0, 0, - 7.199999999999999, + 7.021639999999999, 1.0 ], "texture": "#dark_metal" @@ -485,90 +1095,99 @@ }, { "from": [ - 5.0, - 5.0, - 30.0 + 4.48918, + 4.48918, + 3.03 ], "to": [ - 11.0, - 11.0, - 32.0 + 11.510819999999999, + 11.510819999999999, + 3.97 ], "faces": { "north": { "uv": [ 0, 0, - 6.0, - 6.0 + 7.021639999999999, + 7.021639999999999 ], - "texture": "#nozzle" + "texture": "#dark_metal" }, "south": { "uv": [ 0, 0, - 6.0, - 6.0 + 7.021639999999999, + 7.021639999999999 ], - "texture": "#nozzle" + "texture": "#dark_metal" }, "east": { "uv": [ 0, 0, - 2.0, - 6.0 + 0.9400000000000004, + 7.021639999999999 ], - "texture": "#nozzle" + "texture": "#dark_metal" }, "west": { "uv": [ 0, 0, - 2.0, - 6.0 + 0.9400000000000004, + 7.021639999999999 ], - "texture": "#nozzle" + "texture": "#dark_metal" }, "up": { "uv": [ 0, 0, - 6.0, - 2.0 + 7.021639999999999, + 0.9400000000000004 ], - "texture": "#nozzle" + "texture": "#dark_metal" }, "down": { "uv": [ 0, 0, - 6.0, - 2.0 + 7.021639999999999, + 0.9400000000000004 ], - "texture": "#nozzle" + "texture": "#dark_metal" } + }, + "rotation": { + "angle": 45, + "axis": "z", + "origin": [ + 8.0, + 8.0, + 3.5 + ] } }, { "from": [ - 1.0, - 7.5, - 24.0 + 11.24, + 7.55, + 23.0 ], "to": [ - 4.5, - 8.5, - 30.0 + 14.815000000000001, + 8.45, + 28.0 ], "faces": { "north": { "uv": [ 0, 0, - 3.5, - 1.0 + 3.575000000000001, + 0.8999999999999995 ], "texture": "#ru_khaki" }, @@ -576,8 +1195,8 @@ "uv": [ 0, 0, - 3.5, - 1.0 + 3.575000000000001, + 0.8999999999999995 ], "texture": "#ru_khaki" }, @@ -585,8 +1204,8 @@ "uv": [ 0, 0, - 6.0, - 1.0 + 5.0, + 0.8999999999999995 ], "texture": "#ru_khaki" }, @@ -594,8 +1213,8 @@ "uv": [ 0, 0, - 6.0, - 1.0 + 5.0, + 0.8999999999999995 ], "texture": "#ru_khaki" }, @@ -603,8 +1222,8 @@ "uv": [ 0, 0, - 3.5, - 6.0 + 3.575000000000001, + 5.0 ], "texture": "#ru_khaki" }, @@ -612,8 +1231,8 @@ "uv": [ 0, 0, - 3.5, - 6.0 + 3.575000000000001, + 5.0 ], "texture": "#ru_khaki" } @@ -621,22 +1240,22 @@ }, { "from": [ - 11.5, - 7.5, - 24.0 + 1.1849999999999987, + 7.55, + 23.0 ], "to": [ - 15.0, - 8.5, - 30.0 + 4.76, + 8.45, + 28.0 ], "faces": { "north": { "uv": [ 0, 0, - 3.5, - 1.0 + 3.575000000000001, + 0.8999999999999995 ], "texture": "#ru_khaki" }, @@ -644,8 +1263,8 @@ "uv": [ 0, 0, - 3.5, - 1.0 + 3.575000000000001, + 0.8999999999999995 ], "texture": "#ru_khaki" }, @@ -653,8 +1272,8 @@ "uv": [ 0, 0, - 6.0, - 1.0 + 5.0, + 0.8999999999999995 ], "texture": "#ru_khaki" }, @@ -662,8 +1281,8 @@ "uv": [ 0, 0, - 6.0, - 1.0 + 5.0, + 0.8999999999999995 ], "texture": "#ru_khaki" }, @@ -671,8 +1290,8 @@ "uv": [ 0, 0, - 3.5, - 6.0 + 3.575000000000001, + 5.0 ], "texture": "#ru_khaki" }, @@ -680,8 +1299,8 @@ "uv": [ 0, 0, - 3.5, - 6.0 + 3.575000000000001, + 5.0 ], "texture": "#ru_khaki" } @@ -689,22 +1308,22 @@ }, { "from": [ - 7.5, - 1.0, - 24.0 + 14.815000000000001, + 7.55, + 25.0 ], "to": [ - 8.5, - 4.5, - 30.0 + 17.740000000000002, + 8.45, + 28.0 ], "faces": { "north": { "uv": [ 0, 0, - 1.0, - 3.5 + 2.9250000000000007, + 0.8999999999999995 ], "texture": "#ru_khaki" }, @@ -712,8 +1331,8 @@ "uv": [ 0, 0, - 1.0, - 3.5 + 2.9250000000000007, + 0.8999999999999995 ], "texture": "#ru_khaki" }, @@ -721,8 +1340,8 @@ "uv": [ 0, 0, - 6.0, - 3.5 + 3.0, + 0.8999999999999995 ], "texture": "#ru_khaki" }, @@ -730,8 +1349,8 @@ "uv": [ 0, 0, - 6.0, - 3.5 + 3.0, + 0.8999999999999995 ], "texture": "#ru_khaki" }, @@ -739,8 +1358,8 @@ "uv": [ 0, 0, - 1.0, - 6.0 + 2.9250000000000007, + 3.0 ], "texture": "#ru_khaki" }, @@ -748,8 +1367,8 @@ "uv": [ 0, 0, - 1.0, - 6.0 + 2.9250000000000007, + 3.0 ], "texture": "#ru_khaki" } @@ -757,22 +1376,22 @@ }, { "from": [ - 7.5, - 11.5, - 24.0 + -1.740000000000002, + 7.55, + 25.0 ], "to": [ - 8.5, - 15.0, - 30.0 + 1.1849999999999987, + 8.45, + 28.0 ], "faces": { "north": { "uv": [ 0, 0, - 1.0, - 3.5 + 2.9250000000000007, + 0.8999999999999995 ], "texture": "#ru_khaki" }, @@ -780,8 +1399,8 @@ "uv": [ 0, 0, - 1.0, - 3.5 + 2.9250000000000007, + 0.8999999999999995 ], "texture": "#ru_khaki" }, @@ -789,8 +1408,8 @@ "uv": [ 0, 0, - 6.0, - 3.5 + 3.0, + 0.8999999999999995 ], "texture": "#ru_khaki" }, @@ -798,8 +1417,8 @@ "uv": [ 0, 0, - 6.0, - 3.5 + 3.0, + 0.8999999999999995 ], "texture": "#ru_khaki" }, @@ -807,8 +1426,8 @@ "uv": [ 0, 0, - 1.0, - 6.0 + 2.9250000000000007, + 3.0 ], "texture": "#ru_khaki" }, @@ -816,12 +1435,420 @@ "uv": [ 0, 0, - 1.0, - 6.0 + 2.9250000000000007, + 3.0 ], "texture": "#ru_khaki" } } + }, + { + "from": [ + 7.55, + 11.24, + 23.0 + ], + "to": [ + 8.45, + 14.815000000000001, + 28.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 0.8999999999999995, + 3.575000000000001 + ], + "texture": "#ru_khaki" + }, + "south": { + "uv": [ + 0, + 0, + 0.8999999999999995, + 3.575000000000001 + ], + "texture": "#ru_khaki" + }, + "east": { + "uv": [ + 0, + 0, + 5.0, + 3.575000000000001 + ], + "texture": "#ru_khaki" + }, + "west": { + "uv": [ + 0, + 0, + 5.0, + 3.575000000000001 + ], + "texture": "#ru_khaki" + }, + "up": { + "uv": [ + 0, + 0, + 0.8999999999999995, + 5.0 + ], + "texture": "#ru_khaki" + }, + "down": { + "uv": [ + 0, + 0, + 0.8999999999999995, + 5.0 + ], + "texture": "#ru_khaki" + } + } + }, + { + "from": [ + 7.55, + 14.815000000000001, + 25.0 + ], + "to": [ + 8.45, + 17.740000000000002, + 28.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 0.8999999999999995, + 2.9250000000000007 + ], + "texture": "#ru_khaki" + }, + "south": { + "uv": [ + 0, + 0, + 0.8999999999999995, + 2.9250000000000007 + ], + "texture": "#ru_khaki" + }, + "east": { + "uv": [ + 0, + 0, + 3.0, + 2.9250000000000007 + ], + "texture": "#ru_khaki" + }, + "west": { + "uv": [ + 0, + 0, + 3.0, + 2.9250000000000007 + ], + "texture": "#ru_khaki" + }, + "up": { + "uv": [ + 0, + 0, + 0.8999999999999995, + 3.0 + ], + "texture": "#ru_khaki" + }, + "down": { + "uv": [ + 0, + 0, + 0.8999999999999995, + 3.0 + ], + "texture": "#ru_khaki" + } + } + }, + { + "from": [ + 7.55, + 1.1849999999999996, + 23.0 + ], + "to": [ + 8.45, + 4.76, + 28.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 0.8999999999999995, + 3.575 + ], + "texture": "#ru_khaki" + }, + "south": { + "uv": [ + 0, + 0, + 0.8999999999999995, + 3.575 + ], + "texture": "#ru_khaki" + }, + "east": { + "uv": [ + 0, + 0, + 5.0, + 3.575 + ], + "texture": "#ru_khaki" + }, + "west": { + "uv": [ + 0, + 0, + 5.0, + 3.575 + ], + "texture": "#ru_khaki" + }, + "up": { + "uv": [ + 0, + 0, + 0.8999999999999995, + 5.0 + ], + "texture": "#ru_khaki" + }, + "down": { + "uv": [ + 0, + 0, + 0.8999999999999995, + 5.0 + ], + "texture": "#ru_khaki" + } + } + }, + { + "from": [ + 7.55, + -1.7400000000000002, + 25.0 + ], + "to": [ + 8.45, + 1.1849999999999996, + 28.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 0.8999999999999995, + 2.925 + ], + "texture": "#ru_khaki" + }, + "south": { + "uv": [ + 0, + 0, + 0.8999999999999995, + 2.925 + ], + "texture": "#ru_khaki" + }, + "east": { + "uv": [ + 0, + 0, + 3.0, + 2.925 + ], + "texture": "#ru_khaki" + }, + "west": { + "uv": [ + 0, + 0, + 3.0, + 2.925 + ], + "texture": "#ru_khaki" + }, + "up": { + "uv": [ + 0, + 0, + 0.8999999999999995, + 3.0 + ], + "texture": "#ru_khaki" + }, + "down": { + "uv": [ + 0, + 0, + 0.8999999999999995, + 3.0 + ], + "texture": "#ru_khaki" + } + } + }, + { + "from": [ + 5.279999999999999, + 5.279999999999999, + 28.0 + ], + "to": [ + 10.72, + 10.72, + 29.6 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 5.440000000000001, + 5.440000000000001 + ], + "texture": "#bare_nozzle" + }, + "south": { + "uv": [ + 0, + 0, + 5.440000000000001, + 5.440000000000001 + ], + "texture": "#bare_nozzle" + }, + "east": { + "uv": [ + 0, + 0, + 1.6000000000000014, + 5.440000000000001 + ], + "texture": "#bare_nozzle" + }, + "west": { + "uv": [ + 0, + 0, + 1.6000000000000014, + 5.440000000000001 + ], + "texture": "#bare_nozzle" + }, + "up": { + "uv": [ + 0, + 0, + 5.440000000000001, + 1.6000000000000014 + ], + "texture": "#bare_nozzle" + }, + "down": { + "uv": [ + 0, + 0, + 5.440000000000001, + 1.6000000000000014 + ], + "texture": "#bare_nozzle" + } + } + }, + { + "from": [ + 6.13, + 6.13, + 29.6 + ], + "to": [ + 9.870000000000001, + 9.870000000000001, + 29.9 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.740000000000001, + 3.740000000000001 + ], + "texture": "#glow_ember" + }, + "south": { + "uv": [ + 0, + 0, + 3.740000000000001, + 3.740000000000001 + ], + "texture": "#glow_ember" + }, + "east": { + "uv": [ + 0, + 0, + 0.29999999999999716, + 3.740000000000001 + ], + "texture": "#glow_ember" + }, + "west": { + "uv": [ + 0, + 0, + 0.29999999999999716, + 3.740000000000001 + ], + "texture": "#glow_ember" + }, + "up": { + "uv": [ + 0, + 0, + 3.740000000000001, + 0.29999999999999716 + ], + "texture": "#glow_ember" + }, + "down": { + "uv": [ + 0, + 0, + 3.740000000000001, + 0.29999999999999716 + ], + "texture": "#glow_ember" + } + } } ] } \ No newline at end of file diff --git a/airdef-mod/assets/airdef/models/block/kalibr.json b/airdef-mod/assets/airdef/models/block/kalibr.json index b483de9..cf33b62 100644 --- a/airdef-mod/assets/airdef/models/block/kalibr.json +++ b/airdef-mod/assets/airdef/models/block/kalibr.json @@ -2,28 +2,32 @@ "ambientocclusion": false, "textures": { "missile_grey": "airdef:block/missile_grey", + "rm_grey": "airdef:block/rm_grey", + "rm_grey_t": "airdef:block/rm_grey_t", "dark_metal": "airdef:block/dark_metal", + "bare_nozzle": "airdef:block/bare_nozzle", + "glow_ember": "airdef:block/glow_ember", "particle": "airdef:block/missile_grey" }, "elements": [ { "from": [ - 7.0, - 7.0, + 7.220675060123435, + 7.220675060123435, -16.0 ], "to": [ - 9.0, - 9.0, - -14.333333333333334 + 8.779324939876565, + 8.779324939876565, + -14.25 ], "faces": { "north": { "uv": [ 0, 0, - 2.0, - 2.0 + 1.5586498797531299, + 1.5586498797531299 ], "texture": "#missile_grey" }, @@ -31,8 +35,8 @@ "uv": [ 0, 0, - 2.0, - 2.0 + 1.5586498797531299, + 1.5586498797531299 ], "texture": "#missile_grey" }, @@ -40,8 +44,8 @@ "uv": [ 0, 0, - 1.666666666666666, - 2.0 + 1.75, + 1.5586498797531299 ], "texture": "#missile_grey" }, @@ -49,8 +53,8 @@ "uv": [ 0, 0, - 1.666666666666666, - 2.0 + 1.75, + 1.5586498797531299 ], "texture": "#missile_grey" }, @@ -58,8 +62,8 @@ "uv": [ 0, 0, - 2.0, - 1.666666666666666 + 1.5586498797531299, + 1.75 ], "texture": "#missile_grey" }, @@ -67,8 +71,8 @@ "uv": [ 0, 0, - 2.0, - 1.666666666666666 + 1.5586498797531299, + 1.75 ], "texture": "#missile_grey" } @@ -76,22 +80,22 @@ }, { "from": [ - 6.5, - 6.5, - -14.333333333333334 + 7.220675060123435, + 7.220675060123435, + -15.97 ], "to": [ - 9.5, - 9.5, - -12.666666666666666 + 8.779324939876565, + 8.779324939876565, + -14.28 ], "faces": { "north": { "uv": [ 0, 0, - 3.0, - 3.0 + 1.5586498797531299, + 1.5586498797531299 ], "texture": "#missile_grey" }, @@ -99,8 +103,8 @@ "uv": [ 0, 0, - 3.0, - 3.0 + 1.5586498797531299, + 1.5586498797531299 ], "texture": "#missile_grey" }, @@ -108,8 +112,8 @@ "uv": [ 0, 0, - 1.6666666666666679, - 3.0 + 1.6900000000000013, + 1.5586498797531299 ], "texture": "#missile_grey" }, @@ -117,8 +121,8 @@ "uv": [ 0, 0, - 1.6666666666666679, - 3.0 + 1.6900000000000013, + 1.5586498797531299 ], "texture": "#missile_grey" }, @@ -126,8 +130,8 @@ "uv": [ 0, 0, - 3.0, - 1.6666666666666679 + 1.5586498797531299, + 1.6900000000000013 ], "texture": "#missile_grey" }, @@ -135,31 +139,40 @@ "uv": [ 0, 0, - 3.0, - 1.6666666666666679 + 1.5586498797531299, + 1.6900000000000013 ], "texture": "#missile_grey" } + }, + "rotation": { + "angle": 45, + "axis": "z", + "origin": [ + 8.0, + 8.0, + -15.125 + ] } }, { "from": [ - 6.0, - 6.0, - -12.666666666666666 + 6.730415652424811, + 6.730415652424811, + -14.25 ], "to": [ - 10.0, - 10.0, - -11.0 + 9.26958434757519, + 9.26958434757519, + -12.5 ], "faces": { "north": { "uv": [ 0, 0, - 4.0, - 4.0 + 2.539168695150379, + 2.539168695150379 ], "texture": "#missile_grey" }, @@ -167,8 +180,8 @@ "uv": [ 0, 0, - 4.0, - 4.0 + 2.539168695150379, + 2.539168695150379 ], "texture": "#missile_grey" }, @@ -176,8 +189,8 @@ "uv": [ 0, 0, - 1.666666666666666, - 4.0 + 1.75, + 2.539168695150379 ], "texture": "#missile_grey" }, @@ -185,8 +198,8 @@ "uv": [ 0, 0, - 1.666666666666666, - 4.0 + 1.75, + 2.539168695150379 ], "texture": "#missile_grey" }, @@ -194,8 +207,8 @@ "uv": [ 0, 0, - 4.0, - 1.666666666666666 + 2.539168695150379, + 1.75 ], "texture": "#missile_grey" }, @@ -203,8 +216,8 @@ "uv": [ 0, 0, - 4.0, - 1.666666666666666 + 2.539168695150379, + 1.75 ], "texture": "#missile_grey" } @@ -212,22 +225,22 @@ }, { "from": [ - 5.75, - 5.75, - -11.0 + 6.730415652424811, + 6.730415652424811, + -14.22 ], "to": [ - 10.25, - 10.25, - 30.0 + 9.26958434757519, + 9.26958434757519, + -12.53 ], "faces": { "north": { "uv": [ 0, 0, - 4.5, - 4.5 + 2.539168695150379, + 2.539168695150379 ], "texture": "#missile_grey" }, @@ -235,49 +248,493 @@ "uv": [ 0, 0, - 4.5, - 4.5 + 2.539168695150379, + 2.539168695150379 ], "texture": "#missile_grey" }, + "east": { + "uv": [ + 0, + 0, + 1.6900000000000013, + 2.539168695150379 + ], + "texture": "#missile_grey" + }, + "west": { + "uv": [ + 0, + 0, + 1.6900000000000013, + 2.539168695150379 + ], + "texture": "#missile_grey" + }, + "up": { + "uv": [ + 0, + 0, + 2.539168695150379, + 1.6900000000000013 + ], + "texture": "#missile_grey" + }, + "down": { + "uv": [ + 0, + 0, + 2.539168695150379, + 1.6900000000000013 + ], + "texture": "#missile_grey" + } + }, + "rotation": { + "angle": 45, + "axis": "z", + "origin": [ + 8.0, + 8.0, + -13.375 + ] + } + }, + { + "from": [ + 6.362562534814173, + 6.362562534814173, + -12.5 + ], + "to": [ + 9.637437465185826, + 9.637437465185826, + -10.75 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.274874930371653, + 3.274874930371653 + ], + "texture": "#missile_grey" + }, + "south": { + "uv": [ + 0, + 0, + 3.274874930371653, + 3.274874930371653 + ], + "texture": "#missile_grey" + }, + "east": { + "uv": [ + 0, + 0, + 1.75, + 3.274874930371653 + ], + "texture": "#missile_grey" + }, + "west": { + "uv": [ + 0, + 0, + 1.75, + 3.274874930371653 + ], + "texture": "#missile_grey" + }, + "up": { + "uv": [ + 0, + 0, + 3.274874930371653, + 1.75 + ], + "texture": "#missile_grey" + }, + "down": { + "uv": [ + 0, + 0, + 3.274874930371653, + 1.75 + ], + "texture": "#missile_grey" + } + } + }, + { + "from": [ + 6.362562534814173, + 6.362562534814173, + -12.47 + ], + "to": [ + 9.637437465185826, + 9.637437465185826, + -10.78 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.274874930371653, + 3.274874930371653 + ], + "texture": "#missile_grey" + }, + "south": { + "uv": [ + 0, + 0, + 3.274874930371653, + 3.274874930371653 + ], + "texture": "#missile_grey" + }, + "east": { + "uv": [ + 0, + 0, + 1.6900000000000013, + 3.274874930371653 + ], + "texture": "#missile_grey" + }, + "west": { + "uv": [ + 0, + 0, + 1.6900000000000013, + 3.274874930371653 + ], + "texture": "#missile_grey" + }, + "up": { + "uv": [ + 0, + 0, + 3.274874930371653, + 1.6900000000000013 + ], + "texture": "#missile_grey" + }, + "down": { + "uv": [ + 0, + 0, + 3.274874930371653, + 1.6900000000000013 + ], + "texture": "#missile_grey" + } + }, + "rotation": { + "angle": 45, + "axis": "z", + "origin": [ + 8.0, + 8.0, + -11.625 + ] + } + }, + { + "from": [ + 6.052732565350377, + 6.052732565350377, + -10.75 + ], + "to": [ + 9.947267434649623, + 9.947267434649623, + -9.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.894534869299246, + 3.894534869299246 + ], + "texture": "#missile_grey" + }, + "south": { + "uv": [ + 0, + 0, + 3.894534869299246, + 3.894534869299246 + ], + "texture": "#missile_grey" + }, + "east": { + "uv": [ + 0, + 0, + 1.75, + 3.894534869299246 + ], + "texture": "#missile_grey" + }, + "west": { + "uv": [ + 0, + 0, + 1.75, + 3.894534869299246 + ], + "texture": "#missile_grey" + }, + "up": { + "uv": [ + 0, + 0, + 3.894534869299246, + 1.75 + ], + "texture": "#missile_grey" + }, + "down": { + "uv": [ + 0, + 0, + 3.894534869299246, + 1.75 + ], + "texture": "#missile_grey" + } + } + }, + { + "from": [ + 6.052732565350377, + 6.052732565350377, + -10.72 + ], + "to": [ + 9.947267434649623, + 9.947267434649623, + -9.03 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.894534869299246, + 3.894534869299246 + ], + "texture": "#missile_grey" + }, + "south": { + "uv": [ + 0, + 0, + 3.894534869299246, + 3.894534869299246 + ], + "texture": "#missile_grey" + }, + "east": { + "uv": [ + 0, + 0, + 1.6900000000000013, + 3.894534869299246 + ], + "texture": "#missile_grey" + }, + "west": { + "uv": [ + 0, + 0, + 1.6900000000000013, + 3.894534869299246 + ], + "texture": "#missile_grey" + }, + "up": { + "uv": [ + 0, + 0, + 3.894534869299246, + 1.6900000000000013 + ], + "texture": "#missile_grey" + }, + "down": { + "uv": [ + 0, + 0, + 3.894534869299246, + 1.6900000000000013 + ], + "texture": "#missile_grey" + } + }, + "rotation": { + "angle": 45, + "axis": "z", + "origin": [ + 8.0, + 8.0, + -9.875 + ] + } + }, + { + "from": [ + 5.96742, + 5.96742, + -9.0 + ], + "to": [ + 10.03258, + 10.03258, + 28.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 4.06516, + 4.06516 + ], + "texture": "#rm_grey" + }, + "south": { + "uv": [ + 0, + 0, + 4.06516, + 4.06516 + ], + "texture": "#rm_grey" + }, "east": { "uv": [ 0, 0, 16, - 4.5 + 4.06516 ], - "texture": "#missile_grey" + "texture": "#rm_grey" }, "west": { "uv": [ 0, 0, 16, - 4.5 + 4.06516 ], - "texture": "#missile_grey" + "texture": "#rm_grey" }, "up": { "uv": [ 0, 0, - 4.5, + 4.06516, 16 ], - "texture": "#missile_grey" + "texture": "#rm_grey_t" }, "down": { "uv": [ 0, 0, - 4.5, + 4.06516, 16 ], - "texture": "#missile_grey" + "texture": "#rm_grey_t" } } }, + { + "from": [ + 5.96742, + 5.96742, + -8.97 + ], + "to": [ + 10.03258, + 10.03258, + 27.97 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 4.06516, + 4.06516 + ], + "texture": "#rm_grey" + }, + "south": { + "uv": [ + 0, + 0, + 4.06516, + 4.06516 + ], + "texture": "#rm_grey" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 4.06516 + ], + "texture": "#rm_grey" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 4.06516 + ], + "texture": "#rm_grey" + }, + "up": { + "uv": [ + 0, + 0, + 4.06516, + 16 + ], + "texture": "#rm_grey_t" + }, + "down": { + "uv": [ + 0, + 0, + 4.06516, + 16 + ], + "texture": "#rm_grey_t" + } + }, + "rotation": { + "angle": 45, + "axis": "z", + "origin": [ + 8.0, + 8.0, + 9.5 + ] + } + }, { "from": [ -6.0, @@ -348,22 +805,90 @@ }, { "from": [ - 7.6, - 10.25, - 25.0 + 7.2, + 3.2, + 17.0 ], "to": [ - 8.4, - 14.0, - 30.0 + 8.8, + 5.4, + 26.0 ], "faces": { "north": { "uv": [ 0, 0, - 0.8000000000000007, - 3.75 + 1.6000000000000005, + 2.2 + ], + "texture": "#dark_metal" + }, + "south": { + "uv": [ + 0, + 0, + 1.6000000000000005, + 2.2 + ], + "texture": "#dark_metal" + }, + "east": { + "uv": [ + 0, + 0, + 9.0, + 2.2 + ], + "texture": "#dark_metal" + }, + "west": { + "uv": [ + 0, + 0, + 9.0, + 2.2 + ], + "texture": "#dark_metal" + }, + "up": { + "uv": [ + 0, + 0, + 1.6000000000000005, + 9.0 + ], + "texture": "#dark_metal" + }, + "down": { + "uv": [ + 0, + 0, + 1.6000000000000005, + 9.0 + ], + "texture": "#dark_metal" + } + } + }, + { + "from": [ + 9.98, + 7.65, + 23.0 + ], + "to": [ + 12.455, + 8.35, + 28.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 2.4749999999999996, + 0.6999999999999993 ], "texture": "#missile_grey" }, @@ -371,8 +896,8 @@ "uv": [ 0, 0, - 0.8000000000000007, - 3.75 + 2.4749999999999996, + 0.6999999999999993 ], "texture": "#missile_grey" }, @@ -381,7 +906,7 @@ 0, 0, 5.0, - 3.75 + 0.6999999999999993 ], "texture": "#missile_grey" }, @@ -390,7 +915,7 @@ 0, 0, 5.0, - 3.75 + 0.6999999999999993 ], "texture": "#missile_grey" }, @@ -398,7 +923,7 @@ "uv": [ 0, 0, - 0.8000000000000007, + 2.4749999999999996, 5.0 ], "texture": "#missile_grey" @@ -407,7 +932,7 @@ "uv": [ 0, 0, - 0.8000000000000007, + 2.4749999999999996, 5.0 ], "texture": "#missile_grey" @@ -416,90 +941,22 @@ }, { "from": [ - 6.5, - 3.0, - 18.0 + 3.545, + 7.65, + 23.0 ], "to": [ - 9.5, - 5.75, - 26.0 + 6.02, + 8.35, + 28.0 ], "faces": { "north": { "uv": [ 0, 0, - 3.0, - 2.75 - ], - "texture": "#dark_metal" - }, - "south": { - "uv": [ - 0, - 0, - 3.0, - 2.75 - ], - "texture": "#dark_metal" - }, - "east": { - "uv": [ - 0, - 0, - 8.0, - 2.75 - ], - "texture": "#dark_metal" - }, - "west": { - "uv": [ - 0, - 0, - 8.0, - 2.75 - ], - "texture": "#dark_metal" - }, - "up": { - "uv": [ - 0, - 0, - 3.0, - 8.0 - ], - "texture": "#dark_metal" - }, - "down": { - "uv": [ - 0, - 0, - 3.0, - 8.0 - ], - "texture": "#dark_metal" - } - } - }, - { - "from": [ - 2.0, - 7.6, - 26.0 - ], - "to": [ - 5.75, - 8.4, - 30.0 - ], - "faces": { - "north": { - "uv": [ - 0, - 0, - 3.75, - 0.8000000000000007 + 2.4749999999999996, + 0.6999999999999993 ], "texture": "#missile_grey" }, @@ -507,8 +964,8 @@ "uv": [ 0, 0, - 3.75, - 0.8000000000000007 + 2.4749999999999996, + 0.6999999999999993 ], "texture": "#missile_grey" }, @@ -516,8 +973,8 @@ "uv": [ 0, 0, - 4.0, - 0.8000000000000007 + 5.0, + 0.6999999999999993 ], "texture": "#missile_grey" }, @@ -525,8 +982,8 @@ "uv": [ 0, 0, - 4.0, - 0.8000000000000007 + 5.0, + 0.6999999999999993 ], "texture": "#missile_grey" }, @@ -534,8 +991,8 @@ "uv": [ 0, 0, - 3.75, - 4.0 + 2.4749999999999996, + 5.0 ], "texture": "#missile_grey" }, @@ -543,8 +1000,8 @@ "uv": [ 0, 0, - 3.75, - 4.0 + 2.4749999999999996, + 5.0 ], "texture": "#missile_grey" } @@ -552,22 +1009,22 @@ }, { "from": [ - 10.25, - 7.6, - 26.0 + 12.455, + 7.65, + 25.5 ], "to": [ - 14.0, - 8.4, - 30.0 + 14.48, + 8.35, + 28.0 ], "faces": { "north": { "uv": [ 0, 0, - 3.75, - 0.8000000000000007 + 2.0250000000000004, + 0.6999999999999993 ], "texture": "#missile_grey" }, @@ -575,8 +1032,8 @@ "uv": [ 0, 0, - 3.75, - 0.8000000000000007 + 2.0250000000000004, + 0.6999999999999993 ], "texture": "#missile_grey" }, @@ -584,8 +1041,8 @@ "uv": [ 0, 0, - 4.0, - 0.8000000000000007 + 2.5, + 0.6999999999999993 ], "texture": "#missile_grey" }, @@ -593,8 +1050,8 @@ "uv": [ 0, 0, - 4.0, - 0.8000000000000007 + 2.5, + 0.6999999999999993 ], "texture": "#missile_grey" }, @@ -602,8 +1059,8 @@ "uv": [ 0, 0, - 3.75, - 4.0 + 2.0250000000000004, + 2.5 ], "texture": "#missile_grey" }, @@ -611,12 +1068,488 @@ "uv": [ 0, 0, - 3.75, - 4.0 + 2.0250000000000004, + 2.5 ], "texture": "#missile_grey" } } + }, + { + "from": [ + 1.5199999999999996, + 7.65, + 25.5 + ], + "to": [ + 3.545, + 8.35, + 28.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 2.0250000000000004, + 0.6999999999999993 + ], + "texture": "#missile_grey" + }, + "south": { + "uv": [ + 0, + 0, + 2.0250000000000004, + 0.6999999999999993 + ], + "texture": "#missile_grey" + }, + "east": { + "uv": [ + 0, + 0, + 2.5, + 0.6999999999999993 + ], + "texture": "#missile_grey" + }, + "west": { + "uv": [ + 0, + 0, + 2.5, + 0.6999999999999993 + ], + "texture": "#missile_grey" + }, + "up": { + "uv": [ + 0, + 0, + 2.0250000000000004, + 2.5 + ], + "texture": "#missile_grey" + }, + "down": { + "uv": [ + 0, + 0, + 2.0250000000000004, + 2.5 + ], + "texture": "#missile_grey" + } + } + }, + { + "from": [ + 7.65, + 9.98, + 23.0 + ], + "to": [ + 8.35, + 12.455, + 28.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 2.4749999999999996 + ], + "texture": "#missile_grey" + }, + "south": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 2.4749999999999996 + ], + "texture": "#missile_grey" + }, + "east": { + "uv": [ + 0, + 0, + 5.0, + 2.4749999999999996 + ], + "texture": "#missile_grey" + }, + "west": { + "uv": [ + 0, + 0, + 5.0, + 2.4749999999999996 + ], + "texture": "#missile_grey" + }, + "up": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 5.0 + ], + "texture": "#missile_grey" + }, + "down": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 5.0 + ], + "texture": "#missile_grey" + } + } + }, + { + "from": [ + 7.65, + 12.455, + 25.5 + ], + "to": [ + 8.35, + 14.48, + 28.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 2.0250000000000004 + ], + "texture": "#missile_grey" + }, + "south": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 2.0250000000000004 + ], + "texture": "#missile_grey" + }, + "east": { + "uv": [ + 0, + 0, + 2.5, + 2.0250000000000004 + ], + "texture": "#missile_grey" + }, + "west": { + "uv": [ + 0, + 0, + 2.5, + 2.0250000000000004 + ], + "texture": "#missile_grey" + }, + "up": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 2.5 + ], + "texture": "#missile_grey" + }, + "down": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 2.5 + ], + "texture": "#missile_grey" + } + } + }, + { + "from": [ + 7.65, + 3.5449999999999995, + 23.0 + ], + "to": [ + 8.35, + 6.02, + 28.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 2.475 + ], + "texture": "#missile_grey" + }, + "south": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 2.475 + ], + "texture": "#missile_grey" + }, + "east": { + "uv": [ + 0, + 0, + 5.0, + 2.475 + ], + "texture": "#missile_grey" + }, + "west": { + "uv": [ + 0, + 0, + 5.0, + 2.475 + ], + "texture": "#missile_grey" + }, + "up": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 5.0 + ], + "texture": "#missile_grey" + }, + "down": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 5.0 + ], + "texture": "#missile_grey" + } + } + }, + { + "from": [ + 7.65, + 1.5199999999999996, + 25.5 + ], + "to": [ + 8.35, + 3.5449999999999995, + 28.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 2.025 + ], + "texture": "#missile_grey" + }, + "south": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 2.025 + ], + "texture": "#missile_grey" + }, + "east": { + "uv": [ + 0, + 0, + 2.5, + 2.025 + ], + "texture": "#missile_grey" + }, + "west": { + "uv": [ + 0, + 0, + 2.5, + 2.025 + ], + "texture": "#missile_grey" + }, + "up": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 2.5 + ], + "texture": "#missile_grey" + }, + "down": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 2.5 + ], + "texture": "#missile_grey" + } + } + }, + { + "from": [ + 6.4, + 6.4, + 28.0 + ], + "to": [ + 9.6, + 9.6, + 29.6 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.1999999999999993, + 3.1999999999999993 + ], + "texture": "#bare_nozzle" + }, + "south": { + "uv": [ + 0, + 0, + 3.1999999999999993, + 3.1999999999999993 + ], + "texture": "#bare_nozzle" + }, + "east": { + "uv": [ + 0, + 0, + 1.6000000000000014, + 3.1999999999999993 + ], + "texture": "#bare_nozzle" + }, + "west": { + "uv": [ + 0, + 0, + 1.6000000000000014, + 3.1999999999999993 + ], + "texture": "#bare_nozzle" + }, + "up": { + "uv": [ + 0, + 0, + 3.1999999999999993, + 1.6000000000000014 + ], + "texture": "#bare_nozzle" + }, + "down": { + "uv": [ + 0, + 0, + 3.1999999999999993, + 1.6000000000000014 + ], + "texture": "#bare_nozzle" + } + } + }, + { + "from": [ + 6.9, + 6.9, + 29.6 + ], + "to": [ + 9.1, + 9.1, + 29.9 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 2.1999999999999993, + 2.1999999999999993 + ], + "texture": "#glow_ember" + }, + "south": { + "uv": [ + 0, + 0, + 2.1999999999999993, + 2.1999999999999993 + ], + "texture": "#glow_ember" + }, + "east": { + "uv": [ + 0, + 0, + 0.29999999999999716, + 2.1999999999999993 + ], + "texture": "#glow_ember" + }, + "west": { + "uv": [ + 0, + 0, + 0.29999999999999716, + 2.1999999999999993 + ], + "texture": "#glow_ember" + }, + "up": { + "uv": [ + 0, + 0, + 2.1999999999999993, + 0.29999999999999716 + ], + "texture": "#glow_ember" + }, + "down": { + "uv": [ + 0, + 0, + 2.1999999999999993, + 0.29999999999999716 + ], + "texture": "#glow_ember" + } + } } ] } \ No newline at end of file diff --git a/airdef-mod/assets/airdef/models/block/kh101.json b/airdef-mod/assets/airdef/models/block/kh101.json index cba3536..17015be 100644 --- a/airdef-mod/assets/airdef/models/block/kh101.json +++ b/airdef-mod/assets/airdef/models/block/kh101.json @@ -4,8 +4,7 @@ "kh101": "airdef:block/kh101", "kh101_belly": "airdef:block/kh101_belly", "dark_metal": "airdef:block/dark_metal", - "intake": "airdef:block/intake", - "nozzle": "airdef:block/nozzle", + "bare_nozzle": "airdef:block/bare_nozzle", "particle": "airdef:block/kh101" }, "elements": [ @@ -776,7 +775,7 @@ 3.0, 2.5 ], - "texture": "#intake" + "texture": "#bare_nozzle" }, "south": { "uv": [ @@ -785,7 +784,7 @@ 3.0, 2.5 ], - "texture": "#intake" + "texture": "#bare_nozzle" }, "east": { "uv": [ @@ -794,7 +793,7 @@ 1.0, 2.5 ], - "texture": "#intake" + "texture": "#bare_nozzle" }, "west": { "uv": [ @@ -803,7 +802,7 @@ 1.0, 2.5 ], - "texture": "#intake" + "texture": "#bare_nozzle" }, "up": { "uv": [ @@ -812,7 +811,7 @@ 3.0, 1.0 ], - "texture": "#intake" + "texture": "#bare_nozzle" }, "down": { "uv": [ @@ -821,7 +820,7 @@ 3.0, 1.0 ], - "texture": "#intake" + "texture": "#bare_nozzle" } } }, @@ -844,7 +843,7 @@ 3.0, 2.5 ], - "texture": "#nozzle" + "texture": "#bare_nozzle" }, "south": { "uv": [ @@ -853,7 +852,7 @@ 3.0, 2.5 ], - "texture": "#nozzle" + "texture": "#bare_nozzle" }, "east": { "uv": [ @@ -862,7 +861,7 @@ 1.5, 2.5 ], - "texture": "#nozzle" + "texture": "#bare_nozzle" }, "west": { "uv": [ @@ -871,7 +870,7 @@ 1.5, 2.5 ], - "texture": "#nozzle" + "texture": "#bare_nozzle" }, "up": { "uv": [ @@ -880,7 +879,7 @@ 3.0, 1.5 ], - "texture": "#nozzle" + "texture": "#bare_nozzle" }, "down": { "uv": [ @@ -889,7 +888,7 @@ 3.0, 1.5 ], - "texture": "#nozzle" + "texture": "#bare_nozzle" } } } diff --git a/airdef-mod/assets/airdef/models/block/kh22.json b/airdef-mod/assets/airdef/models/block/kh22.json index 14f9443..2f01e8b 100644 --- a/airdef-mod/assets/airdef/models/block/kh22.json +++ b/airdef-mod/assets/airdef/models/block/kh22.json @@ -2,7 +2,7 @@ "ambientocclusion": false, "textures": { "missile_ru": "airdef:block/missile_ru", - "nozzle": "airdef:block/nozzle", + "bare_nozzle": "airdef:block/bare_nozzle", "particle": "airdef:block/missile_ru" }, "elements": [ @@ -501,7 +501,7 @@ 5.0, 5.0 ], - "texture": "#nozzle" + "texture": "#bare_nozzle" }, "south": { "uv": [ @@ -510,7 +510,7 @@ 5.0, 5.0 ], - "texture": "#nozzle" + "texture": "#bare_nozzle" }, "east": { "uv": [ @@ -519,7 +519,7 @@ 2.0, 5.0 ], - "texture": "#nozzle" + "texture": "#bare_nozzle" }, "west": { "uv": [ @@ -528,7 +528,7 @@ 2.0, 5.0 ], - "texture": "#nozzle" + "texture": "#bare_nozzle" }, "up": { "uv": [ @@ -537,7 +537,7 @@ 5.0, 2.0 ], - "texture": "#nozzle" + "texture": "#bare_nozzle" }, "down": { "uv": [ @@ -546,7 +546,7 @@ 5.0, 2.0 ], - "texture": "#nozzle" + "texture": "#bare_nozzle" } } }, diff --git a/airdef-mod/assets/airdef/models/block/kinzhal.json b/airdef-mod/assets/airdef/models/block/kinzhal.json index d10b956..7f85a84 100644 --- a/airdef-mod/assets/airdef/models/block/kinzhal.json +++ b/airdef-mod/assets/airdef/models/block/kinzhal.json @@ -1,21 +1,23 @@ { "ambientocclusion": false, "textures": { - "missile_grey": "airdef:block/missile_grey", + "rm_dark": "airdef:block/rm_dark", + "rm_dark_t": "airdef:block/rm_dark_t", "dark_metal": "airdef:block/dark_metal", - "nozzle": "airdef:block/nozzle", - "particle": "airdef:block/missile_grey" + "bare_nozzle": "airdef:block/bare_nozzle", + "glow_ember": "airdef:block/glow_ember", + "particle": "airdef:block/rm_dark" }, "elements": [ { "from": [ - 6.9375, - 6.9375, + 6.934694169941659, + 6.934694169941659, -16.0 ], "to": [ - 9.0625, - 9.0625, + 9.06530583005834, + 9.06530583005834, -14.0 ], "faces": { @@ -23,67 +25,144 @@ "uv": [ 0, 0, - 2.125, - 2.125 + 2.1306116601166813, + 2.1306116601166813 ], - "texture": "#missile_grey" + "texture": "#rm_dark" }, "south": { "uv": [ 0, 0, - 2.125, - 2.125 + 2.1306116601166813, + 2.1306116601166813 ], - "texture": "#missile_grey" + "texture": "#rm_dark" }, "east": { "uv": [ 0, 0, 2.0, - 2.125 + 2.1306116601166813 ], - "texture": "#missile_grey" + "texture": "#rm_dark" }, "west": { "uv": [ 0, 0, 2.0, - 2.125 + 2.1306116601166813 ], - "texture": "#missile_grey" + "texture": "#rm_dark" }, "up": { "uv": [ 0, 0, - 2.125, + 2.1306116601166813, 2.0 ], - "texture": "#missile_grey" + "texture": "#rm_dark_t" }, "down": { "uv": [ 0, 0, - 2.125, + 2.1306116601166813, 2.0 ], - "texture": "#missile_grey" + "texture": "#rm_dark_t" } } }, { "from": [ - 6.3125, - 6.3125, + 6.934694169941659, + 6.934694169941659, + -15.97 + ], + "to": [ + 9.06530583005834, + 9.06530583005834, + -14.03 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 2.1306116601166813, + 2.1306116601166813 + ], + "texture": "#rm_dark" + }, + "south": { + "uv": [ + 0, + 0, + 2.1306116601166813, + 2.1306116601166813 + ], + "texture": "#rm_dark" + }, + "east": { + "uv": [ + 0, + 0, + 1.9400000000000013, + 2.1306116601166813 + ], + "texture": "#rm_dark" + }, + "west": { + "uv": [ + 0, + 0, + 1.9400000000000013, + 2.1306116601166813 + ], + "texture": "#rm_dark" + }, + "up": { + "uv": [ + 0, + 0, + 2.1306116601166813, + 1.9400000000000013 + ], + "texture": "#rm_dark_t" + }, + "down": { + "uv": [ + 0, + 0, + 2.1306116601166813, + 1.9400000000000013 + ], + "texture": "#rm_dark_t" + } + }, + "rotation": { + "angle": 45, + "axis": "z", + "origin": [ + 8.0, + 8.0, + -15.0 + ] + } + }, + { + "from": [ + 6.264529289365638, + 6.264529289365638, -14.0 ], "to": [ - 9.6875, - 9.6875, + 9.735470710634363, + 9.735470710634363, -12.0 ], "faces": { @@ -91,67 +170,144 @@ "uv": [ 0, 0, - 3.375, - 3.375 + 3.4709414212687255, + 3.4709414212687255 ], - "texture": "#missile_grey" + "texture": "#rm_dark" }, "south": { "uv": [ 0, 0, - 3.375, - 3.375 + 3.4709414212687255, + 3.4709414212687255 ], - "texture": "#missile_grey" + "texture": "#rm_dark" }, "east": { "uv": [ 0, 0, 2.0, - 3.375 + 3.4709414212687255 ], - "texture": "#missile_grey" + "texture": "#rm_dark" }, "west": { "uv": [ 0, 0, 2.0, - 3.375 + 3.4709414212687255 ], - "texture": "#missile_grey" + "texture": "#rm_dark" }, "up": { "uv": [ 0, 0, - 3.375, + 3.4709414212687255, 2.0 ], - "texture": "#missile_grey" + "texture": "#rm_dark_t" }, "down": { "uv": [ 0, 0, - 3.375, + 3.4709414212687255, 2.0 ], - "texture": "#missile_grey" + "texture": "#rm_dark_t" } } }, { "from": [ - 5.6875, - 5.6875, + 6.264529289365638, + 6.264529289365638, + -13.97 + ], + "to": [ + 9.735470710634363, + 9.735470710634363, + -12.03 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4709414212687255, + 3.4709414212687255 + ], + "texture": "#rm_dark" + }, + "south": { + "uv": [ + 0, + 0, + 3.4709414212687255, + 3.4709414212687255 + ], + "texture": "#rm_dark" + }, + "east": { + "uv": [ + 0, + 0, + 1.9400000000000013, + 3.4709414212687255 + ], + "texture": "#rm_dark" + }, + "west": { + "uv": [ + 0, + 0, + 1.9400000000000013, + 3.4709414212687255 + ], + "texture": "#rm_dark" + }, + "up": { + "uv": [ + 0, + 0, + 3.4709414212687255, + 1.9400000000000013 + ], + "texture": "#rm_dark_t" + }, + "down": { + "uv": [ + 0, + 0, + 3.4709414212687255, + 1.9400000000000013 + ], + "texture": "#rm_dark_t" + } + }, + "rotation": { + "angle": 45, + "axis": "z", + "origin": [ + 8.0, + 8.0, + -13.0 + ] + } + }, + { + "from": [ + 5.761688881283975, + 5.761688881283975, -12.0 ], "to": [ - 10.3125, - 10.3125, + 10.238311118716025, + 10.238311118716025, -10.0 ], "faces": { @@ -159,67 +315,144 @@ "uv": [ 0, 0, - 4.625, - 4.625 + 4.47662223743205, + 4.47662223743205 ], - "texture": "#missile_grey" + "texture": "#rm_dark" }, "south": { "uv": [ 0, 0, - 4.625, - 4.625 + 4.47662223743205, + 4.47662223743205 ], - "texture": "#missile_grey" + "texture": "#rm_dark" }, "east": { "uv": [ 0, 0, 2.0, - 4.625 + 4.47662223743205 ], - "texture": "#missile_grey" + "texture": "#rm_dark" }, "west": { "uv": [ 0, 0, 2.0, - 4.625 + 4.47662223743205 ], - "texture": "#missile_grey" + "texture": "#rm_dark" }, "up": { "uv": [ 0, 0, - 4.625, + 4.47662223743205, 2.0 ], - "texture": "#missile_grey" + "texture": "#rm_dark_t" }, "down": { "uv": [ 0, 0, - 4.625, + 4.47662223743205, 2.0 ], - "texture": "#missile_grey" + "texture": "#rm_dark_t" } } }, { "from": [ - 5.0625, - 5.0625, + 5.761688881283975, + 5.761688881283975, + -11.97 + ], + "to": [ + 10.238311118716025, + 10.238311118716025, + -10.03 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 4.47662223743205, + 4.47662223743205 + ], + "texture": "#rm_dark" + }, + "south": { + "uv": [ + 0, + 0, + 4.47662223743205, + 4.47662223743205 + ], + "texture": "#rm_dark" + }, + "east": { + "uv": [ + 0, + 0, + 1.9400000000000013, + 4.47662223743205 + ], + "texture": "#rm_dark" + }, + "west": { + "uv": [ + 0, + 0, + 1.9400000000000013, + 4.47662223743205 + ], + "texture": "#rm_dark" + }, + "up": { + "uv": [ + 0, + 0, + 4.47662223743205, + 1.9400000000000013 + ], + "texture": "#rm_dark_t" + }, + "down": { + "uv": [ + 0, + 0, + 4.47662223743205, + 1.9400000000000013 + ], + "texture": "#rm_dark_t" + } + }, + "rotation": { + "angle": 45, + "axis": "z", + "origin": [ + 8.0, + 8.0, + -11.0 + ] + } + }, + { + "from": [ + 5.33816378166525, + 5.33816378166525, -10.0 ], "to": [ - 10.9375, - 10.9375, + 10.66183621833475, + 10.66183621833475, -8.0 ], "faces": { @@ -227,280 +460,443 @@ "uv": [ 0, 0, - 5.875, - 5.875 + 5.323672436669501, + 5.323672436669501 ], - "texture": "#missile_grey" + "texture": "#rm_dark" }, "south": { "uv": [ 0, 0, - 5.875, - 5.875 + 5.323672436669501, + 5.323672436669501 ], - "texture": "#missile_grey" + "texture": "#rm_dark" }, "east": { "uv": [ 0, 0, 2.0, - 5.875 + 5.323672436669501 ], - "texture": "#missile_grey" + "texture": "#rm_dark" }, "west": { "uv": [ 0, 0, 2.0, - 5.875 + 5.323672436669501 ], - "texture": "#missile_grey" + "texture": "#rm_dark" }, "up": { "uv": [ 0, 0, - 5.875, + 5.323672436669501, 2.0 ], - "texture": "#missile_grey" + "texture": "#rm_dark_t" }, "down": { "uv": [ 0, 0, - 5.875, + 5.323672436669501, 2.0 ], - "texture": "#missile_grey" + "texture": "#rm_dark_t" } } }, { "from": [ - 4.75, - 4.75, + 5.33816378166525, + 5.33816378166525, + -9.97 + ], + "to": [ + 10.66183621833475, + 10.66183621833475, + -8.03 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 5.323672436669501, + 5.323672436669501 + ], + "texture": "#rm_dark" + }, + "south": { + "uv": [ + 0, + 0, + 5.323672436669501, + 5.323672436669501 + ], + "texture": "#rm_dark" + }, + "east": { + "uv": [ + 0, + 0, + 1.9400000000000013, + 5.323672436669501 + ], + "texture": "#rm_dark" + }, + "west": { + "uv": [ + 0, + 0, + 1.9400000000000013, + 5.323672436669501 + ], + "texture": "#rm_dark" + }, + "up": { + "uv": [ + 0, + 0, + 5.323672436669501, + 1.9400000000000013 + ], + "texture": "#rm_dark_t" + }, + "down": { + "uv": [ + 0, + 0, + 5.323672436669501, + 1.9400000000000013 + ], + "texture": "#rm_dark_t" + } + }, + "rotation": { + "angle": 45, + "axis": "z", + "origin": [ + 8.0, + 8.0, + -9.0 + ] + } + }, + { + "from": [ + 4.963843150910867, + 4.963843150910867, -8.0 ], "to": [ - 11.25, - 11.25, - 30.0 + 11.036156849089133, + 11.036156849089133, + -6.0 ], "faces": { "north": { "uv": [ 0, 0, - 6.5, - 6.5 + 6.072313698178267, + 6.072313698178267 ], - "texture": "#dark_metal" + "texture": "#rm_dark" }, "south": { "uv": [ 0, 0, - 6.5, - 6.5 + 6.072313698178267, + 6.072313698178267 ], - "texture": "#dark_metal" - }, - "east": { - "uv": [ - 0, - 0, - 16, - 6.5 - ], - "texture": "#dark_metal" - }, - "west": { - "uv": [ - 0, - 0, - 16, - 6.5 - ], - "texture": "#dark_metal" - }, - "up": { - "uv": [ - 0, - 0, - 6.5, - 16 - ], - "texture": "#dark_metal" - }, - "down": { - "uv": [ - 0, - 0, - 6.5, - 16 - ], - "texture": "#dark_metal" - } - } - }, - { - "from": [ - 4.6, - 4.6, - -4.0 - ], - "to": [ - 11.4, - 11.4, - -3.0 - ], - "faces": { - "north": { - "uv": [ - 0, - 0, - 6.800000000000001, - 6.800000000000001 - ], - "texture": "#missile_grey" - }, - "south": { - "uv": [ - 0, - 0, - 6.800000000000001, - 6.800000000000001 - ], - "texture": "#missile_grey" - }, - "east": { - "uv": [ - 0, - 0, - 1.0, - 6.800000000000001 - ], - "texture": "#missile_grey" - }, - "west": { - "uv": [ - 0, - 0, - 1.0, - 6.800000000000001 - ], - "texture": "#missile_grey" - }, - "up": { - "uv": [ - 0, - 0, - 6.800000000000001, - 1.0 - ], - "texture": "#missile_grey" - }, - "down": { - "uv": [ - 0, - 0, - 6.800000000000001, - 1.0 - ], - "texture": "#missile_grey" - } - } - }, - { - "from": [ - 5.5, - 5.5, - 30.0 - ], - "to": [ - 10.5, - 10.5, - 32.0 - ], - "faces": { - "north": { - "uv": [ - 0, - 0, - 5.0, - 5.0 - ], - "texture": "#nozzle" - }, - "south": { - "uv": [ - 0, - 0, - 5.0, - 5.0 - ], - "texture": "#nozzle" + "texture": "#rm_dark" }, "east": { "uv": [ 0, 0, 2.0, - 5.0 + 6.072313698178267 ], - "texture": "#nozzle" + "texture": "#rm_dark" }, "west": { "uv": [ 0, 0, 2.0, - 5.0 + 6.072313698178267 ], - "texture": "#nozzle" + "texture": "#rm_dark" }, "up": { "uv": [ 0, 0, - 5.0, + 6.072313698178267, 2.0 ], - "texture": "#nozzle" + "texture": "#rm_dark_t" }, "down": { "uv": [ 0, 0, - 5.0, + 6.072313698178267, 2.0 ], - "texture": "#nozzle" + "texture": "#rm_dark_t" } } }, { "from": [ - 0.0, - 7.6, - 22.0 + 4.963843150910867, + 4.963843150910867, + -7.97 ], "to": [ - 4.75, - 8.4, - 30.0 + 11.036156849089133, + 11.036156849089133, + -6.03 ], "faces": { "north": { "uv": [ 0, 0, - 4.75, - 0.8000000000000007 + 6.072313698178267, + 6.072313698178267 + ], + "texture": "#rm_dark" + }, + "south": { + "uv": [ + 0, + 0, + 6.072313698178267, + 6.072313698178267 + ], + "texture": "#rm_dark" + }, + "east": { + "uv": [ + 0, + 0, + 1.9399999999999995, + 6.072313698178267 + ], + "texture": "#rm_dark" + }, + "west": { + "uv": [ + 0, + 0, + 1.9399999999999995, + 6.072313698178267 + ], + "texture": "#rm_dark" + }, + "up": { + "uv": [ + 0, + 0, + 6.072313698178267, + 1.9399999999999995 + ], + "texture": "#rm_dark_t" + }, + "down": { + "uv": [ + 0, + 0, + 6.072313698178267, + 1.9399999999999995 + ], + "texture": "#rm_dark_t" + } + }, + "rotation": { + "angle": 45, + "axis": "z", + "origin": [ + 8.0, + 8.0, + -7.0 + ] + } + }, + { + "from": [ + 4.85874, + 4.85874, + -6.0 + ], + "to": [ + 11.141259999999999, + 11.141259999999999, + 28.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 6.282519999999999, + 6.282519999999999 + ], + "texture": "#rm_dark" + }, + "south": { + "uv": [ + 0, + 0, + 6.282519999999999, + 6.282519999999999 + ], + "texture": "#rm_dark" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 6.282519999999999 + ], + "texture": "#rm_dark" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 6.282519999999999 + ], + "texture": "#rm_dark" + }, + "up": { + "uv": [ + 0, + 0, + 6.282519999999999, + 16 + ], + "texture": "#rm_dark_t" + }, + "down": { + "uv": [ + 0, + 0, + 6.282519999999999, + 16 + ], + "texture": "#rm_dark_t" + } + } + }, + { + "from": [ + 4.85874, + 4.85874, + -5.97 + ], + "to": [ + 11.141259999999999, + 11.141259999999999, + 27.97 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 6.282519999999999, + 6.282519999999999 + ], + "texture": "#rm_dark" + }, + "south": { + "uv": [ + 0, + 0, + 6.282519999999999, + 6.282519999999999 + ], + "texture": "#rm_dark" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 6.282519999999999 + ], + "texture": "#rm_dark" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 6.282519999999999 + ], + "texture": "#rm_dark" + }, + "up": { + "uv": [ + 0, + 0, + 6.282519999999999, + 16 + ], + "texture": "#rm_dark_t" + }, + "down": { + "uv": [ + 0, + 0, + 6.282519999999999, + 16 + ], + "texture": "#rm_dark_t" + } + }, + "rotation": { + "angle": 45, + "axis": "z", + "origin": [ + 8.0, + 8.0, + 11.0 + ] + } + }, + { + "from": [ + 11.06, + 7.55, + 20.0 + ], + "to": [ + 15.46, + 8.45, + 28.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 4.4, + 0.8999999999999995 ], "texture": "#dark_metal" }, @@ -508,8 +904,8 @@ "uv": [ 0, 0, - 4.75, - 0.8000000000000007 + 4.4, + 0.8999999999999995 ], "texture": "#dark_metal" }, @@ -518,7 +914,7 @@ 0, 0, 8.0, - 0.8000000000000007 + 0.8999999999999995 ], "texture": "#dark_metal" }, @@ -527,7 +923,7 @@ 0, 0, 8.0, - 0.8000000000000007 + 0.8999999999999995 ], "texture": "#dark_metal" }, @@ -535,7 +931,7 @@ "uv": [ 0, 0, - 4.75, + 4.4, 8.0 ], "texture": "#dark_metal" @@ -544,7 +940,7 @@ "uv": [ 0, 0, - 4.75, + 4.4, 8.0 ], "texture": "#dark_metal" @@ -553,22 +949,22 @@ }, { "from": [ - 11.25, - 7.6, - 22.0 + 0.5399999999999991, + 7.55, + 20.0 ], "to": [ - 16.0, - 8.4, - 30.0 + 4.9399999999999995, + 8.45, + 28.0 ], "faces": { "north": { "uv": [ 0, 0, - 4.75, - 0.8000000000000007 + 4.4, + 0.8999999999999995 ], "texture": "#dark_metal" }, @@ -576,8 +972,8 @@ "uv": [ 0, 0, - 4.75, - 0.8000000000000007 + 4.4, + 0.8999999999999995 ], "texture": "#dark_metal" }, @@ -586,7 +982,7 @@ 0, 0, 8.0, - 0.8000000000000007 + 0.8999999999999995 ], "texture": "#dark_metal" }, @@ -595,7 +991,7 @@ 0, 0, 8.0, - 0.8000000000000007 + 0.8999999999999995 ], "texture": "#dark_metal" }, @@ -603,7 +999,7 @@ "uv": [ 0, 0, - 4.75, + 4.4, 8.0 ], "texture": "#dark_metal" @@ -612,7 +1008,7 @@ "uv": [ 0, 0, - 4.75, + 4.4, 8.0 ], "texture": "#dark_metal" @@ -621,22 +1017,22 @@ }, { "from": [ - 7.6, - 0.0, - 22.0 + 15.46, + 7.55, + 24.0 ], "to": [ - 8.4, - 4.75, - 30.0 + 19.060000000000002, + 8.45, + 28.0 ], "faces": { "north": { "uv": [ 0, 0, - 0.8000000000000007, - 4.75 + 3.6000000000000014, + 0.8999999999999995 ], "texture": "#dark_metal" }, @@ -644,8 +1040,144 @@ "uv": [ 0, 0, - 0.8000000000000007, - 4.75 + 3.6000000000000014, + 0.8999999999999995 + ], + "texture": "#dark_metal" + }, + "east": { + "uv": [ + 0, + 0, + 4.0, + 0.8999999999999995 + ], + "texture": "#dark_metal" + }, + "west": { + "uv": [ + 0, + 0, + 4.0, + 0.8999999999999995 + ], + "texture": "#dark_metal" + }, + "up": { + "uv": [ + 0, + 0, + 3.6000000000000014, + 4.0 + ], + "texture": "#dark_metal" + }, + "down": { + "uv": [ + 0, + 0, + 3.6000000000000014, + 4.0 + ], + "texture": "#dark_metal" + } + } + }, + { + "from": [ + -3.0600000000000023, + 7.55, + 24.0 + ], + "to": [ + 0.5399999999999991, + 8.45, + 28.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.6000000000000014, + 0.8999999999999995 + ], + "texture": "#dark_metal" + }, + "south": { + "uv": [ + 0, + 0, + 3.6000000000000014, + 0.8999999999999995 + ], + "texture": "#dark_metal" + }, + "east": { + "uv": [ + 0, + 0, + 4.0, + 0.8999999999999995 + ], + "texture": "#dark_metal" + }, + "west": { + "uv": [ + 0, + 0, + 4.0, + 0.8999999999999995 + ], + "texture": "#dark_metal" + }, + "up": { + "uv": [ + 0, + 0, + 3.6000000000000014, + 4.0 + ], + "texture": "#dark_metal" + }, + "down": { + "uv": [ + 0, + 0, + 3.6000000000000014, + 4.0 + ], + "texture": "#dark_metal" + } + } + }, + { + "from": [ + 7.55, + 11.06, + 20.0 + ], + "to": [ + 8.45, + 15.46, + 28.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 0.8999999999999995, + 4.4 + ], + "texture": "#dark_metal" + }, + "south": { + "uv": [ + 0, + 0, + 0.8999999999999995, + 4.4 ], "texture": "#dark_metal" }, @@ -654,7 +1186,7 @@ 0, 0, 8.0, - 4.75 + 4.4 ], "texture": "#dark_metal" }, @@ -663,7 +1195,7 @@ 0, 0, 8.0, - 4.75 + 4.4 ], "texture": "#dark_metal" }, @@ -671,7 +1203,7 @@ "uv": [ 0, 0, - 0.8000000000000007, + 0.8999999999999995, 8.0 ], "texture": "#dark_metal" @@ -680,7 +1212,7 @@ "uv": [ 0, 0, - 0.8000000000000007, + 0.8999999999999995, 8.0 ], "texture": "#dark_metal" @@ -689,22 +1221,22 @@ }, { "from": [ - 7.6, - 11.25, - 22.0 + 7.55, + 15.46, + 24.0 ], "to": [ - 8.4, - 16.0, - 30.0 + 8.45, + 19.060000000000002, + 28.0 ], "faces": { "north": { "uv": [ 0, 0, - 0.8000000000000007, - 4.75 + 0.8999999999999995, + 3.6000000000000014 ], "texture": "#dark_metal" }, @@ -712,8 +1244,76 @@ "uv": [ 0, 0, - 0.8000000000000007, - 4.75 + 0.8999999999999995, + 3.6000000000000014 + ], + "texture": "#dark_metal" + }, + "east": { + "uv": [ + 0, + 0, + 4.0, + 3.6000000000000014 + ], + "texture": "#dark_metal" + }, + "west": { + "uv": [ + 0, + 0, + 4.0, + 3.6000000000000014 + ], + "texture": "#dark_metal" + }, + "up": { + "uv": [ + 0, + 0, + 0.8999999999999995, + 4.0 + ], + "texture": "#dark_metal" + }, + "down": { + "uv": [ + 0, + 0, + 0.8999999999999995, + 4.0 + ], + "texture": "#dark_metal" + } + } + }, + { + "from": [ + 7.55, + 0.5399999999999991, + 20.0 + ], + "to": [ + 8.45, + 4.9399999999999995, + 28.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 0.8999999999999995, + 4.4 + ], + "texture": "#dark_metal" + }, + "south": { + "uv": [ + 0, + 0, + 0.8999999999999995, + 4.4 ], "texture": "#dark_metal" }, @@ -722,7 +1322,7 @@ 0, 0, 8.0, - 4.75 + 4.4 ], "texture": "#dark_metal" }, @@ -731,7 +1331,7 @@ 0, 0, 8.0, - 4.75 + 4.4 ], "texture": "#dark_metal" }, @@ -739,7 +1339,7 @@ "uv": [ 0, 0, - 0.8000000000000007, + 0.8999999999999995, 8.0 ], "texture": "#dark_metal" @@ -748,12 +1348,216 @@ "uv": [ 0, 0, - 0.8000000000000007, + 0.8999999999999995, 8.0 ], "texture": "#dark_metal" } } + }, + { + "from": [ + 7.55, + -3.0600000000000005, + 24.0 + ], + "to": [ + 8.45, + 0.5399999999999991, + 28.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 0.8999999999999995, + 3.5999999999999996 + ], + "texture": "#dark_metal" + }, + "south": { + "uv": [ + 0, + 0, + 0.8999999999999995, + 3.5999999999999996 + ], + "texture": "#dark_metal" + }, + "east": { + "uv": [ + 0, + 0, + 4.0, + 3.5999999999999996 + ], + "texture": "#dark_metal" + }, + "west": { + "uv": [ + 0, + 0, + 4.0, + 3.5999999999999996 + ], + "texture": "#dark_metal" + }, + "up": { + "uv": [ + 0, + 0, + 0.8999999999999995, + 4.0 + ], + "texture": "#dark_metal" + }, + "down": { + "uv": [ + 0, + 0, + 0.8999999999999995, + 4.0 + ], + "texture": "#dark_metal" + } + } + }, + { + "from": [ + 5.6, + 5.6, + 28.0 + ], + "to": [ + 10.4, + 10.4, + 29.6 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 4.800000000000001, + 4.800000000000001 + ], + "texture": "#bare_nozzle" + }, + "south": { + "uv": [ + 0, + 0, + 4.800000000000001, + 4.800000000000001 + ], + "texture": "#bare_nozzle" + }, + "east": { + "uv": [ + 0, + 0, + 1.6000000000000014, + 4.800000000000001 + ], + "texture": "#bare_nozzle" + }, + "west": { + "uv": [ + 0, + 0, + 1.6000000000000014, + 4.800000000000001 + ], + "texture": "#bare_nozzle" + }, + "up": { + "uv": [ + 0, + 0, + 4.800000000000001, + 1.6000000000000014 + ], + "texture": "#bare_nozzle" + }, + "down": { + "uv": [ + 0, + 0, + 4.800000000000001, + 1.6000000000000014 + ], + "texture": "#bare_nozzle" + } + } + }, + { + "from": [ + 6.35, + 6.35, + 29.6 + ], + "to": [ + 9.65, + 9.65, + 29.9 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.3000000000000007, + 3.3000000000000007 + ], + "texture": "#glow_ember" + }, + "south": { + "uv": [ + 0, + 0, + 3.3000000000000007, + 3.3000000000000007 + ], + "texture": "#glow_ember" + }, + "east": { + "uv": [ + 0, + 0, + 0.29999999999999716, + 3.3000000000000007 + ], + "texture": "#glow_ember" + }, + "west": { + "uv": [ + 0, + 0, + 0.29999999999999716, + 3.3000000000000007 + ], + "texture": "#glow_ember" + }, + "up": { + "uv": [ + 0, + 0, + 3.3000000000000007, + 0.29999999999999716 + ], + "texture": "#glow_ember" + }, + "down": { + "uv": [ + 0, + 0, + 3.3000000000000007, + 0.29999999999999716 + ], + "texture": "#glow_ember" + } + } } ] } \ No newline at end of file diff --git a/airdef-mod/assets/airdef/models/block/lancet.json b/airdef-mod/assets/airdef/models/block/lancet.json index b6a3f9b..68bacdf 100644 --- a/airdef-mod/assets/airdef/models/block/lancet.json +++ b/airdef-mod/assets/airdef/models/block/lancet.json @@ -2,7 +2,7 @@ "ambientocclusion": false, "textures": { "lancet": "airdef:block/lancet", - "intake": "airdef:block/intake", + "bare_nozzle": "airdef:block/bare_nozzle", "dark_metal": "airdef:block/dark_metal", "particle": "airdef:block/lancet" }, @@ -298,7 +298,7 @@ 2.3999999999999995, 1.4000000000000004 ], - "texture": "#intake" + "texture": "#bare_nozzle" }, "south": { "uv": [ @@ -307,7 +307,7 @@ 2.3999999999999995, 1.4000000000000004 ], - "texture": "#intake" + "texture": "#bare_nozzle" }, "east": { "uv": [ @@ -316,7 +316,7 @@ 4.0, 1.4000000000000004 ], - "texture": "#intake" + "texture": "#bare_nozzle" }, "west": { "uv": [ @@ -325,7 +325,7 @@ 4.0, 1.4000000000000004 ], - "texture": "#intake" + "texture": "#bare_nozzle" }, "up": { "uv": [ @@ -334,7 +334,7 @@ 2.3999999999999995, 4.0 ], - "texture": "#intake" + "texture": "#bare_nozzle" }, "down": { "uv": [ @@ -343,7 +343,7 @@ 2.3999999999999995, 4.0 ], - "texture": "#intake" + "texture": "#bare_nozzle" } } }, diff --git a/airdef-mod/assets/airdef/models/block/m48n6.json b/airdef-mod/assets/airdef/models/block/m48n6.json index 75b6cca..cb19548 100644 --- a/airdef-mod/assets/airdef/models/block/m48n6.json +++ b/airdef-mod/assets/airdef/models/block/m48n6.json @@ -2,28 +2,31 @@ "ambientocclusion": false, "textures": { "missile_ru": "airdef:block/missile_ru", - "nozzle": "airdef:block/nozzle", + "rm_ru": "airdef:block/rm_ru", + "rm_ru_t": "airdef:block/rm_ru_t", + "bare_nozzle": "airdef:block/bare_nozzle", + "glow_ember": "airdef:block/glow_ember", "particle": "airdef:block/missile_ru" }, "elements": [ { "from": [ - 7.291666666666667, - 7.291666666666667, + 7.211565172735556, + 7.211565172735556, -16.0 ], "to": [ - 8.708333333333334, - 8.708333333333334, - -14.333333333333334 + 8.788434827264444, + 8.788434827264444, + -13.666666666666666 ], "faces": { "north": { "uv": [ 0, 0, - 1.416666666666667, - 1.416666666666667 + 1.5768696545288883, + 1.5768696545288883 ], "texture": "#missile_ru" }, @@ -31,8 +34,8 @@ "uv": [ 0, 0, - 1.416666666666667, - 1.416666666666667 + 1.5768696545288883, + 1.5768696545288883 ], "texture": "#missile_ru" }, @@ -40,8 +43,8 @@ "uv": [ 0, 0, - 1.666666666666666, - 1.416666666666667 + 2.333333333333334, + 1.5768696545288883 ], "texture": "#missile_ru" }, @@ -49,8 +52,8 @@ "uv": [ 0, 0, - 1.666666666666666, - 1.416666666666667 + 2.333333333333334, + 1.5768696545288883 ], "texture": "#missile_ru" }, @@ -58,8 +61,8 @@ "uv": [ 0, 0, - 1.416666666666667, - 1.666666666666666 + 1.5768696545288883, + 2.333333333333334 ], "texture": "#missile_ru" }, @@ -67,8 +70,8 @@ "uv": [ 0, 0, - 1.416666666666667, - 1.666666666666666 + 1.5768696545288883, + 2.333333333333334 ], "texture": "#missile_ru" } @@ -76,22 +79,22 @@ }, { "from": [ - 6.875, - 6.875, - -14.333333333333334 + 7.211565172735556, + 7.211565172735556, + -15.97 ], "to": [ - 9.125, - 9.125, - -12.666666666666666 + 8.788434827264444, + 8.788434827264444, + -13.696666666666665 ], "faces": { "north": { "uv": [ 0, 0, - 2.25, - 2.25 + 1.5768696545288883, + 1.5768696545288883 ], "texture": "#missile_ru" }, @@ -99,8 +102,8 @@ "uv": [ 0, 0, - 2.25, - 2.25 + 1.5768696545288883, + 1.5768696545288883 ], "texture": "#missile_ru" }, @@ -108,8 +111,8 @@ "uv": [ 0, 0, - 1.6666666666666679, - 2.25 + 2.273333333333335, + 1.5768696545288883 ], "texture": "#missile_ru" }, @@ -117,8 +120,8 @@ "uv": [ 0, 0, - 1.6666666666666679, - 2.25 + 2.273333333333335, + 1.5768696545288883 ], "texture": "#missile_ru" }, @@ -126,8 +129,8 @@ "uv": [ 0, 0, - 2.25, - 1.6666666666666679 + 1.5768696545288883, + 2.273333333333335 ], "texture": "#missile_ru" }, @@ -135,31 +138,40 @@ "uv": [ 0, 0, - 2.25, - 1.6666666666666679 + 1.5768696545288883, + 2.273333333333335 ], "texture": "#missile_ru" } + }, + "rotation": { + "angle": 45, + "axis": "z", + "origin": [ + 8.0, + 8.0, + -14.833333333333332 + ] } }, { "from": [ - 6.458333333333333, - 6.458333333333333, - -12.666666666666666 + 6.715574897504718, + 6.715574897504718, + -13.666666666666666 ], "to": [ - 9.541666666666666, - 9.541666666666666, - -11.0 + 9.284425102495282, + 9.284425102495282, + -11.333333333333332 ], "faces": { "north": { "uv": [ 0, 0, - 3.083333333333333, - 3.083333333333333 + 2.5688502049905644, + 2.5688502049905644 ], "texture": "#missile_ru" }, @@ -167,8 +179,8 @@ "uv": [ 0, 0, - 3.083333333333333, - 3.083333333333333 + 2.5688502049905644, + 2.5688502049905644 ], "texture": "#missile_ru" }, @@ -176,8 +188,8 @@ "uv": [ 0, 0, - 1.666666666666666, - 3.083333333333333 + 2.333333333333334, + 2.5688502049905644 ], "texture": "#missile_ru" }, @@ -185,8 +197,8 @@ "uv": [ 0, 0, - 1.666666666666666, - 3.083333333333333 + 2.333333333333334, + 2.5688502049905644 ], "texture": "#missile_ru" }, @@ -194,8 +206,8 @@ "uv": [ 0, 0, - 3.083333333333333, - 1.666666666666666 + 2.5688502049905644, + 2.333333333333334 ], "texture": "#missile_ru" }, @@ -203,8 +215,8 @@ "uv": [ 0, 0, - 3.083333333333333, - 1.666666666666666 + 2.5688502049905644, + 2.333333333333334 ], "texture": "#missile_ru" } @@ -212,22 +224,22 @@ }, { "from": [ - 6.25, - 6.25, - -11.0 + 6.715574897504718, + 6.715574897504718, + -13.636666666666667 ], "to": [ - 9.75, - 9.75, - 28.0 + 9.284425102495282, + 9.284425102495282, + -11.363333333333332 ], "faces": { "north": { "uv": [ 0, 0, - 3.5, - 3.5 + 2.5688502049905644, + 2.5688502049905644 ], "texture": "#missile_ru" }, @@ -235,26 +247,393 @@ "uv": [ 0, 0, - 3.5, - 3.5 + 2.5688502049905644, + 2.5688502049905644 ], "texture": "#missile_ru" }, + "east": { + "uv": [ + 0, + 0, + 2.273333333333335, + 2.5688502049905644 + ], + "texture": "#missile_ru" + }, + "west": { + "uv": [ + 0, + 0, + 2.273333333333335, + 2.5688502049905644 + ], + "texture": "#missile_ru" + }, + "up": { + "uv": [ + 0, + 0, + 2.5688502049905644, + 2.273333333333335 + ], + "texture": "#missile_ru" + }, + "down": { + "uv": [ + 0, + 0, + 2.5688502049905644, + 2.273333333333335 + ], + "texture": "#missile_ru" + } + }, + "rotation": { + "angle": 45, + "axis": "z", + "origin": [ + 8.0, + 8.0, + -12.5 + ] + } + }, + { + "from": [ + 6.343421775742739, + 6.343421775742739, + -11.333333333333332 + ], + "to": [ + 9.656578224257261, + 9.656578224257261, + -9.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.3131564485145226, + 3.3131564485145226 + ], + "texture": "#missile_ru" + }, + "south": { + "uv": [ + 0, + 0, + 3.3131564485145226, + 3.3131564485145226 + ], + "texture": "#missile_ru" + }, + "east": { + "uv": [ + 0, + 0, + 2.333333333333332, + 3.3131564485145226 + ], + "texture": "#missile_ru" + }, + "west": { + "uv": [ + 0, + 0, + 2.333333333333332, + 3.3131564485145226 + ], + "texture": "#missile_ru" + }, + "up": { + "uv": [ + 0, + 0, + 3.3131564485145226, + 2.333333333333332 + ], + "texture": "#missile_ru" + }, + "down": { + "uv": [ + 0, + 0, + 3.3131564485145226, + 2.333333333333332 + ], + "texture": "#missile_ru" + } + } + }, + { + "from": [ + 6.343421775742739, + 6.343421775742739, + -11.303333333333333 + ], + "to": [ + 9.656578224257261, + 9.656578224257261, + -9.03 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.3131564485145226, + 3.3131564485145226 + ], + "texture": "#missile_ru" + }, + "south": { + "uv": [ + 0, + 0, + 3.3131564485145226, + 3.3131564485145226 + ], + "texture": "#missile_ru" + }, + "east": { + "uv": [ + 0, + 0, + 2.2733333333333334, + 3.3131564485145226 + ], + "texture": "#missile_ru" + }, + "west": { + "uv": [ + 0, + 0, + 2.2733333333333334, + 3.3131564485145226 + ], + "texture": "#missile_ru" + }, + "up": { + "uv": [ + 0, + 0, + 3.3131564485145226, + 2.2733333333333334 + ], + "texture": "#missile_ru" + }, + "down": { + "uv": [ + 0, + 0, + 3.3131564485145226, + 2.2733333333333334 + ], + "texture": "#missile_ru" + } + }, + "rotation": { + "angle": 45, + "axis": "z", + "origin": [ + 8.0, + 8.0, + -10.166666666666666 + ] + } + }, + { + "from": [ + 6.2445900000000005, + 6.2445900000000005, + -9.0 + ], + "to": [ + 9.75541, + 9.75541, + 26.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.510819999999999, + 3.510819999999999 + ], + "texture": "#rm_ru" + }, + "south": { + "uv": [ + 0, + 0, + 3.510819999999999, + 3.510819999999999 + ], + "texture": "#rm_ru" + }, "east": { "uv": [ 0, 0, 16, - 3.5 + 3.510819999999999 ], - "texture": "#missile_ru" + "texture": "#rm_ru" }, "west": { "uv": [ 0, 0, 16, - 3.5 + 3.510819999999999 + ], + "texture": "#rm_ru" + }, + "up": { + "uv": [ + 0, + 0, + 3.510819999999999, + 16 + ], + "texture": "#rm_ru_t" + }, + "down": { + "uv": [ + 0, + 0, + 3.510819999999999, + 16 + ], + "texture": "#rm_ru_t" + } + } + }, + { + "from": [ + 6.2445900000000005, + 6.2445900000000005, + -8.97 + ], + "to": [ + 9.75541, + 9.75541, + 25.97 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.510819999999999, + 3.510819999999999 + ], + "texture": "#rm_ru" + }, + "south": { + "uv": [ + 0, + 0, + 3.510819999999999, + 3.510819999999999 + ], + "texture": "#rm_ru" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 3.510819999999999 + ], + "texture": "#rm_ru" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 3.510819999999999 + ], + "texture": "#rm_ru" + }, + "up": { + "uv": [ + 0, + 0, + 3.510819999999999, + 16 + ], + "texture": "#rm_ru_t" + }, + "down": { + "uv": [ + 0, + 0, + 3.510819999999999, + 16 + ], + "texture": "#rm_ru_t" + } + }, + "rotation": { + "angle": 45, + "axis": "z", + "origin": [ + 8.0, + 8.0, + 8.5 + ] + } + }, + { + "from": [ + 9.71, + 7.65, + 18.0 + ], + "to": [ + 13.120000000000001, + 8.35, + 26.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.41, + 0.6999999999999993 + ], + "texture": "#missile_ru" + }, + "south": { + "uv": [ + 0, + 0, + 3.41, + 0.6999999999999993 + ], + "texture": "#missile_ru" + }, + "east": { + "uv": [ + 0, + 0, + 8.0, + 0.6999999999999993 + ], + "texture": "#missile_ru" + }, + "west": { + "uv": [ + 0, + 0, + 8.0, + 0.6999999999999993 ], "texture": "#missile_ru" }, @@ -262,8 +641,8 @@ "uv": [ 0, 0, - 3.5, - 16 + 3.41, + 8.0 ], "texture": "#missile_ru" }, @@ -271,8 +650,8 @@ "uv": [ 0, 0, - 3.5, - 16 + 3.41, + 8.0 ], "texture": "#missile_ru" } @@ -280,135 +659,1019 @@ }, { "from": [ - 6.5, - 6.5, - 28.0 + 2.879999999999999, + 7.65, + 18.0 ], "to": [ - 9.5, - 9.5, - 30.0 + 6.289999999999999, + 8.35, + 26.0 ], "faces": { "north": { "uv": [ 0, 0, - 3.0, - 3.0 + 3.41, + 0.6999999999999993 ], - "texture": "#nozzle" + "texture": "#missile_ru" }, "south": { + "uv": [ + 0, + 0, + 3.41, + 0.6999999999999993 + ], + "texture": "#missile_ru" + }, + "east": { + "uv": [ + 0, + 0, + 8.0, + 0.6999999999999993 + ], + "texture": "#missile_ru" + }, + "west": { + "uv": [ + 0, + 0, + 8.0, + 0.6999999999999993 + ], + "texture": "#missile_ru" + }, + "up": { + "uv": [ + 0, + 0, + 3.41, + 8.0 + ], + "texture": "#missile_ru" + }, + "down": { + "uv": [ + 0, + 0, + 3.41, + 8.0 + ], + "texture": "#missile_ru" + } + } + }, + { + "from": [ + 13.120000000000001, + 7.65, + 22.0 + ], + "to": [ + 15.91, + 8.35, + 26.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 2.789999999999999, + 0.6999999999999993 + ], + "texture": "#missile_ru" + }, + "south": { + "uv": [ + 0, + 0, + 2.789999999999999, + 0.6999999999999993 + ], + "texture": "#missile_ru" + }, + "east": { + "uv": [ + 0, + 0, + 4.0, + 0.6999999999999993 + ], + "texture": "#missile_ru" + }, + "west": { + "uv": [ + 0, + 0, + 4.0, + 0.6999999999999993 + ], + "texture": "#missile_ru" + }, + "up": { + "uv": [ + 0, + 0, + 2.789999999999999, + 4.0 + ], + "texture": "#missile_ru" + }, + "down": { + "uv": [ + 0, + 0, + 2.789999999999999, + 4.0 + ], + "texture": "#missile_ru" + } + } + }, + { + "from": [ + 0.08999999999999986, + 7.65, + 22.0 + ], + "to": [ + 2.879999999999999, + 8.35, + 26.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 2.789999999999999, + 0.6999999999999993 + ], + "texture": "#missile_ru" + }, + "south": { + "uv": [ + 0, + 0, + 2.789999999999999, + 0.6999999999999993 + ], + "texture": "#missile_ru" + }, + "east": { + "uv": [ + 0, + 0, + 4.0, + 0.6999999999999993 + ], + "texture": "#missile_ru" + }, + "west": { + "uv": [ + 0, + 0, + 4.0, + 0.6999999999999993 + ], + "texture": "#missile_ru" + }, + "up": { + "uv": [ + 0, + 0, + 2.789999999999999, + 4.0 + ], + "texture": "#missile_ru" + }, + "down": { + "uv": [ + 0, + 0, + 2.789999999999999, + 4.0 + ], + "texture": "#missile_ru" + } + } + }, + { + "from": [ + 7.65, + 9.71, + 18.0 + ], + "to": [ + 8.35, + 13.120000000000001, + 26.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 3.41 + ], + "texture": "#missile_ru" + }, + "south": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 3.41 + ], + "texture": "#missile_ru" + }, + "east": { + "uv": [ + 0, + 0, + 8.0, + 3.41 + ], + "texture": "#missile_ru" + }, + "west": { + "uv": [ + 0, + 0, + 8.0, + 3.41 + ], + "texture": "#missile_ru" + }, + "up": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 8.0 + ], + "texture": "#missile_ru" + }, + "down": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 8.0 + ], + "texture": "#missile_ru" + } + } + }, + { + "from": [ + 7.65, + 13.120000000000001, + 22.0 + ], + "to": [ + 8.35, + 15.91, + 26.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 2.789999999999999 + ], + "texture": "#missile_ru" + }, + "south": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 2.789999999999999 + ], + "texture": "#missile_ru" + }, + "east": { + "uv": [ + 0, + 0, + 4.0, + 2.789999999999999 + ], + "texture": "#missile_ru" + }, + "west": { + "uv": [ + 0, + 0, + 4.0, + 2.789999999999999 + ], + "texture": "#missile_ru" + }, + "up": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 4.0 + ], + "texture": "#missile_ru" + }, + "down": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 4.0 + ], + "texture": "#missile_ru" + } + } + }, + { + "from": [ + 7.65, + 2.8799999999999994, + 18.0 + ], + "to": [ + 8.35, + 6.29, + 26.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 3.4100000000000006 + ], + "texture": "#missile_ru" + }, + "south": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 3.4100000000000006 + ], + "texture": "#missile_ru" + }, + "east": { + "uv": [ + 0, + 0, + 8.0, + 3.4100000000000006 + ], + "texture": "#missile_ru" + }, + "west": { + "uv": [ + 0, + 0, + 8.0, + 3.4100000000000006 + ], + "texture": "#missile_ru" + }, + "up": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 8.0 + ], + "texture": "#missile_ru" + }, + "down": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 8.0 + ], + "texture": "#missile_ru" + } + } + }, + { + "from": [ + 7.65, + 0.08999999999999986, + 22.0 + ], + "to": [ + 8.35, + 2.8799999999999994, + 26.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 2.7899999999999996 + ], + "texture": "#missile_ru" + }, + "south": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 2.7899999999999996 + ], + "texture": "#missile_ru" + }, + "east": { + "uv": [ + 0, + 0, + 4.0, + 2.7899999999999996 + ], + "texture": "#missile_ru" + }, + "west": { + "uv": [ + 0, + 0, + 4.0, + 2.7899999999999996 + ], + "texture": "#missile_ru" + }, + "up": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 4.0 + ], + "texture": "#missile_ru" + }, + "down": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 4.0 + ], + "texture": "#missile_ru" + } + } + }, + { + "from": [ + 9.71, + 7.65, + -6.0 + ], + "to": [ + 11.085, + 8.35, + -3.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 1.375, + 0.6999999999999993 + ], + "texture": "#missile_ru" + }, + "south": { + "uv": [ + 0, + 0, + 1.375, + 0.6999999999999993 + ], + "texture": "#missile_ru" + }, + "east": { "uv": [ 0, 0, 3.0, + 0.6999999999999993 + ], + "texture": "#missile_ru" + }, + "west": { + "uv": [ + 0, + 0, + 3.0, + 0.6999999999999993 + ], + "texture": "#missile_ru" + }, + "up": { + "uv": [ + 0, + 0, + 1.375, 3.0 ], - "texture": "#nozzle" + "texture": "#missile_ru" + }, + "down": { + "uv": [ + 0, + 0, + 1.375, + 3.0 + ], + "texture": "#missile_ru" + } + } + }, + { + "from": [ + 4.914999999999999, + 7.65, + -6.0 + ], + "to": [ + 6.289999999999999, + 8.35, + -3.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 1.375, + 0.6999999999999993 + ], + "texture": "#missile_ru" + }, + "south": { + "uv": [ + 0, + 0, + 1.375, + 0.6999999999999993 + ], + "texture": "#missile_ru" + }, + "east": { + "uv": [ + 0, + 0, + 3.0, + 0.6999999999999993 + ], + "texture": "#missile_ru" + }, + "west": { + "uv": [ + 0, + 0, + 3.0, + 0.6999999999999993 + ], + "texture": "#missile_ru" + }, + "up": { + "uv": [ + 0, + 0, + 1.375, + 3.0 + ], + "texture": "#missile_ru" + }, + "down": { + "uv": [ + 0, + 0, + 1.375, + 3.0 + ], + "texture": "#missile_ru" + } + } + }, + { + "from": [ + 11.085, + 7.65, + -5.0 + ], + "to": [ + 12.21, + 8.35, + -3.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 1.125, + 0.6999999999999993 + ], + "texture": "#missile_ru" + }, + "south": { + "uv": [ + 0, + 0, + 1.125, + 0.6999999999999993 + ], + "texture": "#missile_ru" }, "east": { "uv": [ 0, 0, 2.0, - 3.0 + 0.6999999999999993 ], - "texture": "#nozzle" + "texture": "#missile_ru" }, "west": { "uv": [ 0, 0, 2.0, + 0.6999999999999993 + ], + "texture": "#missile_ru" + }, + "up": { + "uv": [ + 0, + 0, + 1.125, + 2.0 + ], + "texture": "#missile_ru" + }, + "down": { + "uv": [ + 0, + 0, + 1.125, + 2.0 + ], + "texture": "#missile_ru" + } + } + }, + { + "from": [ + 3.789999999999999, + 7.65, + -5.0 + ], + "to": [ + 4.914999999999999, + 8.35, + -3.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 1.125, + 0.6999999999999993 + ], + "texture": "#missile_ru" + }, + "south": { + "uv": [ + 0, + 0, + 1.125, + 0.6999999999999993 + ], + "texture": "#missile_ru" + }, + "east": { + "uv": [ + 0, + 0, + 2.0, + 0.6999999999999993 + ], + "texture": "#missile_ru" + }, + "west": { + "uv": [ + 0, + 0, + 2.0, + 0.6999999999999993 + ], + "texture": "#missile_ru" + }, + "up": { + "uv": [ + 0, + 0, + 1.125, + 2.0 + ], + "texture": "#missile_ru" + }, + "down": { + "uv": [ + 0, + 0, + 1.125, + 2.0 + ], + "texture": "#missile_ru" + } + } + }, + { + "from": [ + 7.65, + 9.71, + -6.0 + ], + "to": [ + 8.35, + 11.085, + -3.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 1.375 + ], + "texture": "#missile_ru" + }, + "south": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 1.375 + ], + "texture": "#missile_ru" + }, + "east": { + "uv": [ + 0, + 0, + 3.0, + 1.375 + ], + "texture": "#missile_ru" + }, + "west": { + "uv": [ + 0, + 0, + 3.0, + 1.375 + ], + "texture": "#missile_ru" + }, + "up": { + "uv": [ + 0, + 0, + 0.6999999999999993, 3.0 ], - "texture": "#nozzle" + "texture": "#missile_ru" + }, + "down": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 3.0 + ], + "texture": "#missile_ru" + } + } + }, + { + "from": [ + 7.65, + 11.085, + -5.0 + ], + "to": [ + 8.35, + 12.21, + -3.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 1.125 + ], + "texture": "#missile_ru" + }, + "south": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 1.125 + ], + "texture": "#missile_ru" + }, + "east": { + "uv": [ + 0, + 0, + 2.0, + 1.125 + ], + "texture": "#missile_ru" + }, + "west": { + "uv": [ + 0, + 0, + 2.0, + 1.125 + ], + "texture": "#missile_ru" }, "up": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 2.0 + ], + "texture": "#missile_ru" + }, + "down": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 2.0 + ], + "texture": "#missile_ru" + } + } + }, + { + "from": [ + 7.65, + 4.915, + -6.0 + ], + "to": [ + 8.35, + 6.29, + -3.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 1.375 + ], + "texture": "#missile_ru" + }, + "south": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 1.375 + ], + "texture": "#missile_ru" + }, + "east": { "uv": [ 0, 0, 3.0, - 2.0 + 1.375 ], - "texture": "#nozzle" + "texture": "#missile_ru" }, - "down": { + "west": { "uv": [ 0, 0, 3.0, + 1.375 + ], + "texture": "#missile_ru" + }, + "up": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 3.0 + ], + "texture": "#missile_ru" + }, + "down": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 3.0 + ], + "texture": "#missile_ru" + } + } + }, + { + "from": [ + 7.65, + 3.79, + -5.0 + ], + "to": [ + 8.35, + 4.915, + -3.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 1.125 + ], + "texture": "#missile_ru" + }, + "south": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 1.125 + ], + "texture": "#missile_ru" + }, + "east": { + "uv": [ + 0, + 0, + 2.0, + 1.125 + ], + "texture": "#missile_ru" + }, + "west": { + "uv": [ + 0, + 0, + 2.0, + 1.125 + ], + "texture": "#missile_ru" + }, + "up": { + "uv": [ + 0, + 0, + 0.6999999999999993, 2.0 ], - "texture": "#nozzle" - } - } - }, - { - "from": [ - 1.5, - 7.7, - 20.0 - ], - "to": [ - 6.25, - 8.3, - 28.0 - ], - "faces": { - "north": { - "uv": [ - 0, - 0, - 4.75, - 0.6000000000000005 - ], - "texture": "#missile_ru" - }, - "south": { - "uv": [ - 0, - 0, - 4.75, - 0.6000000000000005 - ], - "texture": "#missile_ru" - }, - "east": { - "uv": [ - 0, - 0, - 8.0, - 0.6000000000000005 - ], - "texture": "#missile_ru" - }, - "west": { - "uv": [ - 0, - 0, - 8.0, - 0.6000000000000005 - ], - "texture": "#missile_ru" - }, - "up": { - "uv": [ - 0, - 0, - 4.75, - 8.0 - ], "texture": "#missile_ru" }, "down": { "uv": [ 0, 0, - 4.75, - 8.0 + 0.6999999999999993, + 2.0 ], "texture": "#missile_ru" } @@ -416,205 +1679,137 @@ }, { "from": [ - 9.75, - 7.7, - 20.0 + 6.48, + 6.48, + 26.0 ], "to": [ - 14.5, - 8.3, - 28.0 + 9.52, + 9.52, + 27.6 ], "faces": { "north": { "uv": [ 0, 0, - 4.75, - 0.6000000000000005 + 3.039999999999999, + 3.039999999999999 ], - "texture": "#missile_ru" + "texture": "#bare_nozzle" }, "south": { "uv": [ 0, 0, - 4.75, - 0.6000000000000005 + 3.039999999999999, + 3.039999999999999 ], - "texture": "#missile_ru" + "texture": "#bare_nozzle" }, "east": { "uv": [ 0, 0, - 8.0, - 0.6000000000000005 + 1.6000000000000014, + 3.039999999999999 ], - "texture": "#missile_ru" + "texture": "#bare_nozzle" }, "west": { "uv": [ 0, 0, - 8.0, - 0.6000000000000005 + 1.6000000000000014, + 3.039999999999999 ], - "texture": "#missile_ru" + "texture": "#bare_nozzle" }, "up": { "uv": [ 0, 0, - 4.75, - 8.0 + 3.039999999999999, + 1.6000000000000014 ], - "texture": "#missile_ru" + "texture": "#bare_nozzle" }, "down": { "uv": [ 0, 0, - 4.75, - 8.0 + 3.039999999999999, + 1.6000000000000014 ], - "texture": "#missile_ru" + "texture": "#bare_nozzle" } } }, { "from": [ - 7.7, - 1.5, - 20.0 + 6.955, + 6.955, + 27.6 ], "to": [ - 8.3, - 6.25, - 28.0 + 9.045, + 9.045, + 27.9 ], "faces": { "north": { "uv": [ 0, 0, - 0.6000000000000005, - 4.75 + 2.09, + 2.09 ], - "texture": "#missile_ru" + "texture": "#glow_ember" }, "south": { "uv": [ 0, 0, - 0.6000000000000005, - 4.75 + 2.09, + 2.09 ], - "texture": "#missile_ru" + "texture": "#glow_ember" }, "east": { "uv": [ 0, 0, - 8.0, - 4.75 + 0.29999999999999716, + 2.09 ], - "texture": "#missile_ru" + "texture": "#glow_ember" }, "west": { "uv": [ 0, 0, - 8.0, - 4.75 + 0.29999999999999716, + 2.09 ], - "texture": "#missile_ru" + "texture": "#glow_ember" }, "up": { "uv": [ 0, 0, - 0.6000000000000005, - 8.0 + 2.09, + 0.29999999999999716 ], - "texture": "#missile_ru" + "texture": "#glow_ember" }, "down": { "uv": [ 0, 0, - 0.6000000000000005, - 8.0 + 2.09, + 0.29999999999999716 ], - "texture": "#missile_ru" - } - } - }, - { - "from": [ - 7.7, - 9.75, - 20.0 - ], - "to": [ - 8.3, - 14.5, - 28.0 - ], - "faces": { - "north": { - "uv": [ - 0, - 0, - 0.6000000000000005, - 4.75 - ], - "texture": "#missile_ru" - }, - "south": { - "uv": [ - 0, - 0, - 0.6000000000000005, - 4.75 - ], - "texture": "#missile_ru" - }, - "east": { - "uv": [ - 0, - 0, - 8.0, - 4.75 - ], - "texture": "#missile_ru" - }, - "west": { - "uv": [ - 0, - 0, - 8.0, - 4.75 - ], - "texture": "#missile_ru" - }, - "up": { - "uv": [ - 0, - 0, - 0.6000000000000005, - 8.0 - ], - "texture": "#missile_ru" - }, - "down": { - "uv": [ - 0, - 0, - 0.6000000000000005, - 8.0 - ], - "texture": "#missile_ru" + "texture": "#glow_ember" } } } diff --git a/airdef-mod/assets/airdef/models/block/m57e6.json b/airdef-mod/assets/airdef/models/block/m57e6.json index 95ec2c4..0493806 100644 --- a/airdef-mod/assets/airdef/models/block/m57e6.json +++ b/airdef-mod/assets/airdef/models/block/m57e6.json @@ -2,28 +2,32 @@ "ambientocclusion": false, "textures": { "missile_ru": "airdef:block/missile_ru", + "rm_ru": "airdef:block/rm_ru", + "rm_ru_t": "airdef:block/rm_ru_t", "booster": "airdef:block/booster", + "bare_nozzle": "airdef:block/bare_nozzle", + "glow_ember": "airdef:block/glow_ember", "particle": "airdef:block/missile_ru" }, "elements": [ { "from": [ - 7.5625, - 7.5625, + 7.502041161727719, + 7.502041161727719, -16.0 ], "to": [ - 8.4375, - 8.4375, - -14.0 + 8.49795883827228, + 8.49795883827228, + -13.666666666666666 ], "faces": { "north": { "uv": [ 0, 0, - 0.875, - 0.875 + 0.9959176765445612, + 0.9959176765445612 ], "texture": "#missile_ru" }, @@ -31,8 +35,8 @@ "uv": [ 0, 0, - 0.875, - 0.875 + 0.9959176765445612, + 0.9959176765445612 ], "texture": "#missile_ru" }, @@ -40,8 +44,8 @@ "uv": [ 0, 0, - 2.0, - 0.875 + 2.333333333333334, + 0.9959176765445612 ], "texture": "#missile_ru" }, @@ -49,8 +53,8 @@ "uv": [ 0, 0, - 2.0, - 0.875 + 2.333333333333334, + 0.9959176765445612 ], "texture": "#missile_ru" }, @@ -58,8 +62,8 @@ "uv": [ 0, 0, - 0.875, - 2.0 + 0.9959176765445612, + 2.333333333333334 ], "texture": "#missile_ru" }, @@ -67,8 +71,8 @@ "uv": [ 0, 0, - 0.875, - 2.0 + 0.9959176765445612, + 2.333333333333334 ], "texture": "#missile_ru" } @@ -76,22 +80,22 @@ }, { "from": [ - 7.1875, - 7.1875, - -14.0 + 7.502041161727719, + 7.502041161727719, + -15.97 ], "to": [ - 8.8125, - 8.8125, - -12.0 + 8.49795883827228, + 8.49795883827228, + -13.696666666666665 ], "faces": { "north": { "uv": [ 0, 0, - 1.625, - 1.625 + 0.9959176765445612, + 0.9959176765445612 ], "texture": "#missile_ru" }, @@ -99,8 +103,8 @@ "uv": [ 0, 0, - 1.625, - 1.625 + 0.9959176765445612, + 0.9959176765445612 ], "texture": "#missile_ru" }, @@ -108,8 +112,8 @@ "uv": [ 0, 0, - 2.0, - 1.625 + 2.273333333333335, + 0.9959176765445612 ], "texture": "#missile_ru" }, @@ -117,8 +121,8 @@ "uv": [ 0, 0, - 2.0, - 1.625 + 2.273333333333335, + 0.9959176765445612 ], "texture": "#missile_ru" }, @@ -126,8 +130,8 @@ "uv": [ 0, 0, - 1.625, - 2.0 + 0.9959176765445612, + 2.273333333333335 ], "texture": "#missile_ru" }, @@ -135,8 +139,85 @@ "uv": [ 0, 0, - 1.625, - 2.0 + 0.9959176765445612, + 2.273333333333335 + ], + "texture": "#missile_ru" + } + }, + "rotation": { + "angle": 45, + "axis": "z", + "origin": [ + 8.0, + 8.0, + -14.833333333333332 + ] + } + }, + { + "from": [ + 7.188784145792454, + 7.188784145792454, + -13.666666666666666 + ], + "to": [ + 8.811215854207546, + 8.811215854207546, + -11.333333333333332 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 1.6224317084150925, + 1.6224317084150925 + ], + "texture": "#missile_ru" + }, + "south": { + "uv": [ + 0, + 0, + 1.6224317084150925, + 1.6224317084150925 + ], + "texture": "#missile_ru" + }, + "east": { + "uv": [ + 0, + 0, + 2.333333333333334, + 1.6224317084150925 + ], + "texture": "#missile_ru" + }, + "west": { + "uv": [ + 0, + 0, + 2.333333333333334, + 1.6224317084150925 + ], + "texture": "#missile_ru" + }, + "up": { + "uv": [ + 0, + 0, + 1.6224317084150925, + 2.333333333333334 + ], + "texture": "#missile_ru" + }, + "down": { + "uv": [ + 0, + 0, + 1.6224317084150925, + 2.333333333333334 ], "texture": "#missile_ru" } @@ -144,13 +225,235 @@ }, { "from": [ - 7.0, - 7.0, - -12.0 + 7.188784145792454, + 7.188784145792454, + -13.636666666666667 ], "to": [ - 9.0, - 9.0, + 8.811215854207546, + 8.811215854207546, + -11.363333333333332 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 1.6224317084150925, + 1.6224317084150925 + ], + "texture": "#missile_ru" + }, + "south": { + "uv": [ + 0, + 0, + 1.6224317084150925, + 1.6224317084150925 + ], + "texture": "#missile_ru" + }, + "east": { + "uv": [ + 0, + 0, + 2.273333333333335, + 1.6224317084150925 + ], + "texture": "#missile_ru" + }, + "west": { + "uv": [ + 0, + 0, + 2.273333333333335, + 1.6224317084150925 + ], + "texture": "#missile_ru" + }, + "up": { + "uv": [ + 0, + 0, + 1.6224317084150925, + 2.273333333333335 + ], + "texture": "#missile_ru" + }, + "down": { + "uv": [ + 0, + 0, + 1.6224317084150925, + 2.273333333333335 + ], + "texture": "#missile_ru" + } + }, + "rotation": { + "angle": 45, + "axis": "z", + "origin": [ + 8.0, + 8.0, + -12.5 + ] + } + }, + { + "from": [ + 6.95374006889015, + 6.95374006889015, + -11.333333333333332 + ], + "to": [ + 9.04625993110985, + 9.04625993110985, + -9.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 2.0925198622196994, + 2.0925198622196994 + ], + "texture": "#missile_ru" + }, + "south": { + "uv": [ + 0, + 0, + 2.0925198622196994, + 2.0925198622196994 + ], + "texture": "#missile_ru" + }, + "east": { + "uv": [ + 0, + 0, + 2.333333333333332, + 2.0925198622196994 + ], + "texture": "#missile_ru" + }, + "west": { + "uv": [ + 0, + 0, + 2.333333333333332, + 2.0925198622196994 + ], + "texture": "#missile_ru" + }, + "up": { + "uv": [ + 0, + 0, + 2.0925198622196994, + 2.333333333333332 + ], + "texture": "#missile_ru" + }, + "down": { + "uv": [ + 0, + 0, + 2.0925198622196994, + 2.333333333333332 + ], + "texture": "#missile_ru" + } + } + }, + { + "from": [ + 6.95374006889015, + 6.95374006889015, + -11.303333333333333 + ], + "to": [ + 9.04625993110985, + 9.04625993110985, + -9.03 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 2.0925198622196994, + 2.0925198622196994 + ], + "texture": "#missile_ru" + }, + "south": { + "uv": [ + 0, + 0, + 2.0925198622196994, + 2.0925198622196994 + ], + "texture": "#missile_ru" + }, + "east": { + "uv": [ + 0, + 0, + 2.2733333333333334, + 2.0925198622196994 + ], + "texture": "#missile_ru" + }, + "west": { + "uv": [ + 0, + 0, + 2.2733333333333334, + 2.0925198622196994 + ], + "texture": "#missile_ru" + }, + "up": { + "uv": [ + 0, + 0, + 2.0925198622196994, + 2.2733333333333334 + ], + "texture": "#missile_ru" + }, + "down": { + "uv": [ + 0, + 0, + 2.0925198622196994, + 2.2733333333333334 + ], + "texture": "#missile_ru" + } + }, + "rotation": { + "angle": 45, + "axis": "z", + "origin": [ + 8.0, + 8.0, + -10.166666666666666 + ] + } + }, + { + "from": [ + 6.89132, + 6.89132, + -9.0 + ], + "to": [ + 9.10868, + 9.10868, 4.0 ], "faces": { @@ -158,8 +461,8 @@ "uv": [ 0, 0, - 2.0, - 2.0 + 2.2173599999999993, + 2.2173599999999993 ], "texture": "#missile_ru" }, @@ -167,8 +470,8 @@ "uv": [ 0, 0, - 2.0, - 2.0 + 2.2173599999999993, + 2.2173599999999993 ], "texture": "#missile_ru" }, @@ -176,8 +479,8 @@ "uv": [ 0, 0, - 16, - 2.0 + 13.0, + 2.2173599999999993 ], "texture": "#missile_ru" }, @@ -185,8 +488,8 @@ "uv": [ 0, 0, - 16, - 2.0 + 13.0, + 2.2173599999999993 ], "texture": "#missile_ru" }, @@ -194,8 +497,8 @@ "uv": [ 0, 0, - 2.0, - 16 + 2.2173599999999993, + 13.0 ], "texture": "#missile_ru" }, @@ -203,8 +506,8 @@ "uv": [ 0, 0, - 2.0, - 16 + 2.2173599999999993, + 13.0 ], "texture": "#missile_ru" } @@ -212,90 +515,244 @@ }, { "from": [ - 6.4, - 6.4, + 6.89132, + 6.89132, + -8.97 + ], + "to": [ + 9.10868, + 9.10868, + 3.97 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 2.2173599999999993, + 2.2173599999999993 + ], + "texture": "#missile_ru" + }, + "south": { + "uv": [ + 0, + 0, + 2.2173599999999993, + 2.2173599999999993 + ], + "texture": "#missile_ru" + }, + "east": { + "uv": [ + 0, + 0, + 12.940000000000001, + 2.2173599999999993 + ], + "texture": "#missile_ru" + }, + "west": { + "uv": [ + 0, + 0, + 12.940000000000001, + 2.2173599999999993 + ], + "texture": "#missile_ru" + }, + "up": { + "uv": [ + 0, + 0, + 2.2173599999999993, + 12.940000000000001 + ], + "texture": "#missile_ru" + }, + "down": { + "uv": [ + 0, + 0, + 2.2173599999999993, + 12.940000000000001 + ], + "texture": "#missile_ru" + } + }, + "rotation": { + "angle": 45, + "axis": "z", + "origin": [ + 8.0, + 8.0, + -2.5 + ] + } + }, + { + "from": [ + 6.4293700000000005, + 6.4293700000000005, 4.0 ], "to": [ - 9.6, - 9.6, - 28.0 + 9.57063, + 9.57063, + 25.0 ], "faces": { "north": { "uv": [ 0, 0, - 3.1999999999999993, - 3.1999999999999993 + 3.141259999999999, + 3.141259999999999 ], - "texture": "#booster" + "texture": "#rm_ru" }, "south": { "uv": [ 0, 0, - 3.1999999999999993, - 3.1999999999999993 + 3.141259999999999, + 3.141259999999999 ], - "texture": "#booster" + "texture": "#rm_ru" }, "east": { "uv": [ 0, 0, 16, - 3.1999999999999993 + 3.141259999999999 ], - "texture": "#booster" + "texture": "#rm_ru" }, "west": { "uv": [ 0, 0, 16, - 3.1999999999999993 + 3.141259999999999 ], - "texture": "#booster" + "texture": "#rm_ru" }, "up": { "uv": [ 0, 0, - 3.1999999999999993, + 3.141259999999999, 16 ], - "texture": "#booster" + "texture": "#rm_ru_t" }, "down": { "uv": [ 0, 0, - 3.1999999999999993, + 3.141259999999999, 16 ], - "texture": "#booster" + "texture": "#rm_ru_t" } } }, { "from": [ - 3.5, - 7.7, - 22.0 + 6.4293700000000005, + 6.4293700000000005, + 4.03 ], "to": [ - 6.4, - 8.3, - 28.0 + 9.57063, + 9.57063, + 24.97 ], "faces": { "north": { "uv": [ 0, 0, - 2.9000000000000004, - 0.6000000000000005 + 3.141259999999999, + 3.141259999999999 + ], + "texture": "#rm_ru" + }, + "south": { + "uv": [ + 0, + 0, + 3.141259999999999, + 3.141259999999999 + ], + "texture": "#rm_ru" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 3.141259999999999 + ], + "texture": "#rm_ru" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 3.141259999999999 + ], + "texture": "#rm_ru" + }, + "up": { + "uv": [ + 0, + 0, + 3.141259999999999, + 16 + ], + "texture": "#rm_ru_t" + }, + "down": { + "uv": [ + 0, + 0, + 3.141259999999999, + 16 + ], + "texture": "#rm_ru_t" + } + }, + "rotation": { + "angle": 45, + "axis": "z", + "origin": [ + 8.0, + 8.0, + 14.5 + ] + } + }, + { + "from": [ + 9.53, + 7.65, + 18.0 + ], + "to": [ + 12.280000000000001, + 8.35, + 25.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 2.7500000000000018, + 0.6999999999999993 ], "texture": "#booster" }, @@ -303,8 +760,8 @@ "uv": [ 0, 0, - 2.9000000000000004, - 0.6000000000000005 + 2.7500000000000018, + 0.6999999999999993 ], "texture": "#booster" }, @@ -312,8 +769,8 @@ "uv": [ 0, 0, - 6.0, - 0.6000000000000005 + 7.0, + 0.6999999999999993 ], "texture": "#booster" }, @@ -321,8 +778,8 @@ "uv": [ 0, 0, - 6.0, - 0.6000000000000005 + 7.0, + 0.6999999999999993 ], "texture": "#booster" }, @@ -330,8 +787,8 @@ "uv": [ 0, 0, - 2.9000000000000004, - 6.0 + 2.7500000000000018, + 7.0 ], "texture": "#booster" }, @@ -339,8 +796,8 @@ "uv": [ 0, 0, - 2.9000000000000004, - 6.0 + 2.7500000000000018, + 7.0 ], "texture": "#booster" } @@ -348,22 +805,22 @@ }, { "from": [ - 9.6, - 7.7, - 22.0 + 3.719999999999999, + 7.65, + 18.0 ], "to": [ - 12.5, - 8.3, - 28.0 + 6.470000000000001, + 8.35, + 25.0 ], "faces": { "north": { "uv": [ 0, 0, - 2.9000000000000004, - 0.6000000000000005 + 2.7500000000000018, + 0.6999999999999993 ], "texture": "#booster" }, @@ -371,8 +828,8 @@ "uv": [ 0, 0, - 2.9000000000000004, - 0.6000000000000005 + 2.7500000000000018, + 0.6999999999999993 ], "texture": "#booster" }, @@ -380,8 +837,8 @@ "uv": [ 0, 0, - 6.0, - 0.6000000000000005 + 7.0, + 0.6999999999999993 ], "texture": "#booster" }, @@ -389,8 +846,8 @@ "uv": [ 0, 0, - 6.0, - 0.6000000000000005 + 7.0, + 0.6999999999999993 ], "texture": "#booster" }, @@ -398,8 +855,8 @@ "uv": [ 0, 0, - 2.9000000000000004, - 6.0 + 2.7500000000000018, + 7.0 ], "texture": "#booster" }, @@ -407,8 +864,8 @@ "uv": [ 0, 0, - 2.9000000000000004, - 6.0 + 2.7500000000000018, + 7.0 ], "texture": "#booster" } @@ -416,22 +873,22 @@ }, { "from": [ - 7.7, - 3.5, - 22.0 + 12.280000000000001, + 7.65, + 21.0 ], "to": [ - 8.3, - 6.4, - 28.0 + 14.530000000000001, + 8.35, + 25.0 ], "faces": { "north": { "uv": [ 0, 0, - 0.6000000000000005, - 2.9000000000000004 + 2.25, + 0.6999999999999993 ], "texture": "#booster" }, @@ -439,8 +896,8 @@ "uv": [ 0, 0, - 0.6000000000000005, - 2.9000000000000004 + 2.25, + 0.6999999999999993 ], "texture": "#booster" }, @@ -448,8 +905,8 @@ "uv": [ 0, 0, - 6.0, - 2.9000000000000004 + 4.0, + 0.6999999999999993 ], "texture": "#booster" }, @@ -457,8 +914,8 @@ "uv": [ 0, 0, - 6.0, - 2.9000000000000004 + 4.0, + 0.6999999999999993 ], "texture": "#booster" }, @@ -466,8 +923,8 @@ "uv": [ 0, 0, - 0.6000000000000005, - 6.0 + 2.25, + 4.0 ], "texture": "#booster" }, @@ -475,8 +932,8 @@ "uv": [ 0, 0, - 0.6000000000000005, - 6.0 + 2.25, + 4.0 ], "texture": "#booster" } @@ -484,22 +941,22 @@ }, { "from": [ - 7.7, - 9.6, - 22.0 + 1.4699999999999989, + 7.65, + 21.0 ], "to": [ - 8.3, - 12.5, - 28.0 + 3.719999999999999, + 8.35, + 25.0 ], "faces": { "north": { "uv": [ 0, 0, - 0.6000000000000005, - 2.9000000000000004 + 2.25, + 0.6999999999999993 ], "texture": "#booster" }, @@ -507,8 +964,8 @@ "uv": [ 0, 0, - 0.6000000000000005, - 2.9000000000000004 + 2.25, + 0.6999999999999993 ], "texture": "#booster" }, @@ -516,8 +973,8 @@ "uv": [ 0, 0, - 6.0, - 2.9000000000000004 + 4.0, + 0.6999999999999993 ], "texture": "#booster" }, @@ -525,8 +982,8 @@ "uv": [ 0, 0, - 6.0, - 2.9000000000000004 + 4.0, + 0.6999999999999993 ], "texture": "#booster" }, @@ -534,8 +991,8 @@ "uv": [ 0, 0, - 0.6000000000000005, - 6.0 + 2.25, + 4.0 ], "texture": "#booster" }, @@ -543,12 +1000,420 @@ "uv": [ 0, 0, - 0.6000000000000005, - 6.0 + 2.25, + 4.0 ], "texture": "#booster" } } + }, + { + "from": [ + 7.65, + 9.53, + 18.0 + ], + "to": [ + 8.35, + 12.28, + 25.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 2.75 + ], + "texture": "#booster" + }, + "south": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 2.75 + ], + "texture": "#booster" + }, + "east": { + "uv": [ + 0, + 0, + 7.0, + 2.75 + ], + "texture": "#booster" + }, + "west": { + "uv": [ + 0, + 0, + 7.0, + 2.75 + ], + "texture": "#booster" + }, + "up": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 7.0 + ], + "texture": "#booster" + }, + "down": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 7.0 + ], + "texture": "#booster" + } + } + }, + { + "from": [ + 7.65, + 12.28, + 21.0 + ], + "to": [ + 8.35, + 14.53, + 25.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 2.25 + ], + "texture": "#booster" + }, + "south": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 2.25 + ], + "texture": "#booster" + }, + "east": { + "uv": [ + 0, + 0, + 4.0, + 2.25 + ], + "texture": "#booster" + }, + "west": { + "uv": [ + 0, + 0, + 4.0, + 2.25 + ], + "texture": "#booster" + }, + "up": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 4.0 + ], + "texture": "#booster" + }, + "down": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 4.0 + ], + "texture": "#booster" + } + } + }, + { + "from": [ + 7.65, + 3.7199999999999998, + 18.0 + ], + "to": [ + 8.35, + 6.47, + 25.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 2.75 + ], + "texture": "#booster" + }, + "south": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 2.75 + ], + "texture": "#booster" + }, + "east": { + "uv": [ + 0, + 0, + 7.0, + 2.75 + ], + "texture": "#booster" + }, + "west": { + "uv": [ + 0, + 0, + 7.0, + 2.75 + ], + "texture": "#booster" + }, + "up": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 7.0 + ], + "texture": "#booster" + }, + "down": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 7.0 + ], + "texture": "#booster" + } + } + }, + { + "from": [ + 7.65, + 1.4699999999999998, + 21.0 + ], + "to": [ + 8.35, + 3.7199999999999998, + 25.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 2.25 + ], + "texture": "#booster" + }, + "south": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 2.25 + ], + "texture": "#booster" + }, + "east": { + "uv": [ + 0, + 0, + 4.0, + 2.25 + ], + "texture": "#booster" + }, + "west": { + "uv": [ + 0, + 0, + 4.0, + 2.25 + ], + "texture": "#booster" + }, + "up": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 4.0 + ], + "texture": "#booster" + }, + "down": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 4.0 + ], + "texture": "#booster" + } + } + }, + { + "from": [ + 6.64, + 6.64, + 25.0 + ], + "to": [ + 9.36, + 9.36, + 26.6 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 2.7199999999999998, + 2.7199999999999998 + ], + "texture": "#bare_nozzle" + }, + "south": { + "uv": [ + 0, + 0, + 2.7199999999999998, + 2.7199999999999998 + ], + "texture": "#bare_nozzle" + }, + "east": { + "uv": [ + 0, + 0, + 1.6000000000000014, + 2.7199999999999998 + ], + "texture": "#bare_nozzle" + }, + "west": { + "uv": [ + 0, + 0, + 1.6000000000000014, + 2.7199999999999998 + ], + "texture": "#bare_nozzle" + }, + "up": { + "uv": [ + 0, + 0, + 2.7199999999999998, + 1.6000000000000014 + ], + "texture": "#bare_nozzle" + }, + "down": { + "uv": [ + 0, + 0, + 2.7199999999999998, + 1.6000000000000014 + ], + "texture": "#bare_nozzle" + } + } + }, + { + "from": [ + 7.0649999999999995, + 7.0649999999999995, + 26.6 + ], + "to": [ + 8.935, + 8.935, + 26.9 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 1.870000000000001, + 1.870000000000001 + ], + "texture": "#glow_ember" + }, + "south": { + "uv": [ + 0, + 0, + 1.870000000000001, + 1.870000000000001 + ], + "texture": "#glow_ember" + }, + "east": { + "uv": [ + 0, + 0, + 0.29999999999999716, + 1.870000000000001 + ], + "texture": "#glow_ember" + }, + "west": { + "uv": [ + 0, + 0, + 0.29999999999999716, + 1.870000000000001 + ], + "texture": "#glow_ember" + }, + "up": { + "uv": [ + 0, + 0, + 1.870000000000001, + 0.29999999999999716 + ], + "texture": "#glow_ember" + }, + "down": { + "uv": [ + 0, + 0, + 1.870000000000001, + 0.29999999999999716 + ], + "texture": "#glow_ember" + } + } } ] } \ No newline at end of file diff --git a/airdef-mod/assets/airdef/models/block/m77n6.json b/airdef-mod/assets/airdef/models/block/m77n6.json index 662ae24..911c4cf 100644 --- a/airdef-mod/assets/airdef/models/block/m77n6.json +++ b/airdef-mod/assets/airdef/models/block/m77n6.json @@ -2,20 +2,23 @@ "ambientocclusion": false, "textures": { "missile_grey": "airdef:block/missile_grey", + "rm_grey": "airdef:block/rm_grey", + "rm_grey_t": "airdef:block/rm_grey_t", "booster": "airdef:block/booster", - "nozzle": "airdef:block/nozzle", + "bare_nozzle": "airdef:block/bare_nozzle", + "glow_ember": "airdef:block/glow_ember", "particle": "airdef:block/missile_grey" }, "elements": [ { "from": [ - 7.25, - 7.25, + 7.220675060123435, + 7.220675060123435, -16.0 ], "to": [ - 8.75, - 8.75, + 8.779324939876565, + 8.779324939876565, -14.0 ], "faces": { @@ -23,8 +26,8 @@ "uv": [ 0, 0, - 1.5, - 1.5 + 1.5586498797531299, + 1.5586498797531299 ], "texture": "#missile_grey" }, @@ -32,8 +35,8 @@ "uv": [ 0, 0, - 1.5, - 1.5 + 1.5586498797531299, + 1.5586498797531299 ], "texture": "#missile_grey" }, @@ -42,7 +45,7 @@ 0, 0, 2.0, - 1.5 + 1.5586498797531299 ], "texture": "#missile_grey" }, @@ -51,7 +54,7 @@ 0, 0, 2.0, - 1.5 + 1.5586498797531299 ], "texture": "#missile_grey" }, @@ -59,7 +62,7 @@ "uv": [ 0, 0, - 1.5, + 1.5586498797531299, 2.0 ], "texture": "#missile_grey" @@ -68,7 +71,7 @@ "uv": [ 0, 0, - 1.5, + 1.5586498797531299, 2.0 ], "texture": "#missile_grey" @@ -77,13 +80,90 @@ }, { "from": [ - 6.75, - 6.75, + 7.220675060123435, + 7.220675060123435, + -15.97 + ], + "to": [ + 8.779324939876565, + 8.779324939876565, + -14.03 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 1.5586498797531299, + 1.5586498797531299 + ], + "texture": "#missile_grey" + }, + "south": { + "uv": [ + 0, + 0, + 1.5586498797531299, + 1.5586498797531299 + ], + "texture": "#missile_grey" + }, + "east": { + "uv": [ + 0, + 0, + 1.9400000000000013, + 1.5586498797531299 + ], + "texture": "#missile_grey" + }, + "west": { + "uv": [ + 0, + 0, + 1.9400000000000013, + 1.5586498797531299 + ], + "texture": "#missile_grey" + }, + "up": { + "uv": [ + 0, + 0, + 1.5586498797531299, + 1.9400000000000013 + ], + "texture": "#missile_grey" + }, + "down": { + "uv": [ + 0, + 0, + 1.5586498797531299, + 1.9400000000000013 + ], + "texture": "#missile_grey" + } + }, + "rotation": { + "angle": 45, + "axis": "z", + "origin": [ + 8.0, + 8.0, + -15.0 + ] + } + }, + { + "from": [ + 6.730415652424811, + 6.730415652424811, -14.0 ], "to": [ - 9.25, - 9.25, + 9.26958434757519, + 9.26958434757519, -12.0 ], "faces": { @@ -91,8 +171,8 @@ "uv": [ 0, 0, - 2.5, - 2.5 + 2.539168695150379, + 2.539168695150379 ], "texture": "#missile_grey" }, @@ -100,8 +180,8 @@ "uv": [ 0, 0, - 2.5, - 2.5 + 2.539168695150379, + 2.539168695150379 ], "texture": "#missile_grey" }, @@ -110,7 +190,7 @@ 0, 0, 2.0, - 2.5 + 2.539168695150379 ], "texture": "#missile_grey" }, @@ -119,7 +199,7 @@ 0, 0, 2.0, - 2.5 + 2.539168695150379 ], "texture": "#missile_grey" }, @@ -127,7 +207,7 @@ "uv": [ 0, 0, - 2.5, + 2.539168695150379, 2.0 ], "texture": "#missile_grey" @@ -136,7 +216,7 @@ "uv": [ 0, 0, - 2.5, + 2.539168695150379, 2.0 ], "texture": "#missile_grey" @@ -145,13 +225,90 @@ }, { "from": [ - 6.25, - 6.25, + 6.730415652424811, + 6.730415652424811, + -13.97 + ], + "to": [ + 9.26958434757519, + 9.26958434757519, + -12.03 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 2.539168695150379, + 2.539168695150379 + ], + "texture": "#missile_grey" + }, + "south": { + "uv": [ + 0, + 0, + 2.539168695150379, + 2.539168695150379 + ], + "texture": "#missile_grey" + }, + "east": { + "uv": [ + 0, + 0, + 1.9400000000000013, + 2.539168695150379 + ], + "texture": "#missile_grey" + }, + "west": { + "uv": [ + 0, + 0, + 1.9400000000000013, + 2.539168695150379 + ], + "texture": "#missile_grey" + }, + "up": { + "uv": [ + 0, + 0, + 2.539168695150379, + 1.9400000000000013 + ], + "texture": "#missile_grey" + }, + "down": { + "uv": [ + 0, + 0, + 2.539168695150379, + 1.9400000000000013 + ], + "texture": "#missile_grey" + } + }, + "rotation": { + "angle": 45, + "axis": "z", + "origin": [ + 8.0, + 8.0, + -13.0 + ] + } + }, + { + "from": [ + 6.362562534814173, + 6.362562534814173, -12.0 ], "to": [ - 9.75, - 9.75, + 9.637437465185826, + 9.637437465185826, -10.0 ], "faces": { @@ -159,8 +316,8 @@ "uv": [ 0, 0, - 3.5, - 3.5 + 3.274874930371653, + 3.274874930371653 ], "texture": "#missile_grey" }, @@ -168,8 +325,8 @@ "uv": [ 0, 0, - 3.5, - 3.5 + 3.274874930371653, + 3.274874930371653 ], "texture": "#missile_grey" }, @@ -178,7 +335,7 @@ 0, 0, 2.0, - 3.5 + 3.274874930371653 ], "texture": "#missile_grey" }, @@ -187,7 +344,7 @@ 0, 0, 2.0, - 3.5 + 3.274874930371653 ], "texture": "#missile_grey" }, @@ -195,7 +352,7 @@ "uv": [ 0, 0, - 3.5, + 3.274874930371653, 2.0 ], "texture": "#missile_grey" @@ -204,7 +361,7 @@ "uv": [ 0, 0, - 3.5, + 3.274874930371653, 2.0 ], "texture": "#missile_grey" @@ -213,22 +370,99 @@ }, { "from": [ - 6.0, - 6.0, + 6.362562534814173, + 6.362562534814173, + -11.97 + ], + "to": [ + 9.637437465185826, + 9.637437465185826, + -10.03 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.274874930371653, + 3.274874930371653 + ], + "texture": "#missile_grey" + }, + "south": { + "uv": [ + 0, + 0, + 3.274874930371653, + 3.274874930371653 + ], + "texture": "#missile_grey" + }, + "east": { + "uv": [ + 0, + 0, + 1.9400000000000013, + 3.274874930371653 + ], + "texture": "#missile_grey" + }, + "west": { + "uv": [ + 0, + 0, + 1.9400000000000013, + 3.274874930371653 + ], + "texture": "#missile_grey" + }, + "up": { + "uv": [ + 0, + 0, + 3.274874930371653, + 1.9400000000000013 + ], + "texture": "#missile_grey" + }, + "down": { + "uv": [ + 0, + 0, + 3.274874930371653, + 1.9400000000000013 + ], + "texture": "#missile_grey" + } + }, + "rotation": { + "angle": 45, + "axis": "z", + "origin": [ + 8.0, + 8.0, + -11.0 + ] + } + }, + { + "from": [ + 6.052732565350377, + 6.052732565350377, -10.0 ], "to": [ - 10.0, - 10.0, - 30.0 + 9.947267434649623, + 9.947267434649623, + -8.0 ], "faces": { "north": { "uv": [ 0, 0, - 4.0, - 4.0 + 3.894534869299246, + 3.894534869299246 ], "texture": "#missile_grey" }, @@ -236,8 +470,8 @@ "uv": [ 0, 0, - 4.0, - 4.0 + 3.894534869299246, + 3.894534869299246 ], "texture": "#missile_grey" }, @@ -245,8 +479,8 @@ "uv": [ 0, 0, - 16, - 4.0 + 2.0, + 3.894534869299246 ], "texture": "#missile_grey" }, @@ -254,8 +488,8 @@ "uv": [ 0, 0, - 16, - 4.0 + 2.0, + 3.894534869299246 ], "texture": "#missile_grey" }, @@ -263,8 +497,8 @@ "uv": [ 0, 0, - 4.0, - 16 + 3.894534869299246, + 2.0 ], "texture": "#missile_grey" }, @@ -272,8 +506,8 @@ "uv": [ 0, 0, - 4.0, - 16 + 3.894534869299246, + 2.0 ], "texture": "#missile_grey" } @@ -281,22 +515,244 @@ }, { "from": [ - 6.0, - 6.0, + 6.052732565350377, + 6.052732565350377, + -9.97 + ], + "to": [ + 9.947267434649623, + 9.947267434649623, + -8.03 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.894534869299246, + 3.894534869299246 + ], + "texture": "#missile_grey" + }, + "south": { + "uv": [ + 0, + 0, + 3.894534869299246, + 3.894534869299246 + ], + "texture": "#missile_grey" + }, + "east": { + "uv": [ + 0, + 0, + 1.9400000000000013, + 3.894534869299246 + ], + "texture": "#missile_grey" + }, + "west": { + "uv": [ + 0, + 0, + 1.9400000000000013, + 3.894534869299246 + ], + "texture": "#missile_grey" + }, + "up": { + "uv": [ + 0, + 0, + 3.894534869299246, + 1.9400000000000013 + ], + "texture": "#missile_grey" + }, + "down": { + "uv": [ + 0, + 0, + 3.894534869299246, + 1.9400000000000013 + ], + "texture": "#missile_grey" + } + }, + "rotation": { + "angle": 45, + "axis": "z", + "origin": [ + 8.0, + 8.0, + -9.0 + ] + } + }, + { + "from": [ + 5.96742, + 5.96742, + -8.0 + ], + "to": [ + 10.03258, + 10.03258, + 28.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 4.06516, + 4.06516 + ], + "texture": "#rm_grey" + }, + "south": { + "uv": [ + 0, + 0, + 4.06516, + 4.06516 + ], + "texture": "#rm_grey" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 4.06516 + ], + "texture": "#rm_grey" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 4.06516 + ], + "texture": "#rm_grey" + }, + "up": { + "uv": [ + 0, + 0, + 4.06516, + 16 + ], + "texture": "#rm_grey_t" + }, + "down": { + "uv": [ + 0, + 0, + 4.06516, + 16 + ], + "texture": "#rm_grey_t" + } + } + }, + { + "from": [ + 5.96742, + 5.96742, + -7.97 + ], + "to": [ + 10.03258, + 10.03258, + 27.97 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 4.06516, + 4.06516 + ], + "texture": "#rm_grey" + }, + "south": { + "uv": [ + 0, + 0, + 4.06516, + 4.06516 + ], + "texture": "#rm_grey" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 4.06516 + ], + "texture": "#rm_grey" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 4.06516 + ], + "texture": "#rm_grey" + }, + "up": { + "uv": [ + 0, + 0, + 4.06516, + 16 + ], + "texture": "#rm_grey_t" + }, + "down": { + "uv": [ + 0, + 0, + 4.06516, + 16 + ], + "texture": "#rm_grey_t" + } + }, + "rotation": { + "angle": 45, + "axis": "z", + "origin": [ + 8.0, + 8.0, + 10.0 + ] + } + }, + { + "from": [ + 5.78264, + 5.78264, 4.0 ], "to": [ - 10.0, - 10.0, - 5.0 + 10.21736, + 10.21736, + 6.0 ], "faces": { "north": { "uv": [ 0, 0, - 4.0, - 4.0 + 4.4347199999999996, + 4.4347199999999996 ], "texture": "#booster" }, @@ -304,135 +760,144 @@ "uv": [ 0, 0, - 4.0, - 4.0 + 4.4347199999999996, + 4.4347199999999996 ], "texture": "#booster" }, - "east": { - "uv": [ - 0, - 0, - 1.0, - 4.0 - ], - "texture": "#booster" - }, - "west": { - "uv": [ - 0, - 0, - 1.0, - 4.0 - ], - "texture": "#booster" - }, - "up": { - "uv": [ - 0, - 0, - 4.0, - 1.0 - ], - "texture": "#booster" - }, - "down": { - "uv": [ - 0, - 0, - 4.0, - 1.0 - ], - "texture": "#booster" - } - } - }, - { - "from": [ - 6.5, - 6.5, - 30.0 - ], - "to": [ - 9.5, - 9.5, - 32.0 - ], - "faces": { - "north": { - "uv": [ - 0, - 0, - 3.0, - 3.0 - ], - "texture": "#nozzle" - }, - "south": { - "uv": [ - 0, - 0, - 3.0, - 3.0 - ], - "texture": "#nozzle" - }, "east": { "uv": [ 0, 0, 2.0, - 3.0 + 4.4347199999999996 ], - "texture": "#nozzle" + "texture": "#booster" }, "west": { "uv": [ 0, 0, 2.0, - 3.0 + 4.4347199999999996 ], - "texture": "#nozzle" + "texture": "#booster" }, "up": { "uv": [ 0, 0, - 3.0, + 4.4347199999999996, 2.0 ], - "texture": "#nozzle" + "texture": "#booster" }, "down": { "uv": [ 0, 0, - 3.0, + 4.4347199999999996, 2.0 ], - "texture": "#nozzle" + "texture": "#booster" } } }, { "from": [ - 3.0, - 7.7, - 24.0 + 5.78264, + 5.78264, + 4.03 ], "to": [ - 6.0, - 8.3, - 30.0 + 10.21736, + 10.21736, + 5.97 ], "faces": { "north": { "uv": [ 0, 0, - 3.0, - 0.6000000000000005 + 4.4347199999999996, + 4.4347199999999996 + ], + "texture": "#booster" + }, + "south": { + "uv": [ + 0, + 0, + 4.4347199999999996, + 4.4347199999999996 + ], + "texture": "#booster" + }, + "east": { + "uv": [ + 0, + 0, + 1.9399999999999995, + 4.4347199999999996 + ], + "texture": "#booster" + }, + "west": { + "uv": [ + 0, + 0, + 1.9399999999999995, + 4.4347199999999996 + ], + "texture": "#booster" + }, + "up": { + "uv": [ + 0, + 0, + 4.4347199999999996, + 1.9399999999999995 + ], + "texture": "#booster" + }, + "down": { + "uv": [ + 0, + 0, + 4.4347199999999996, + 1.9399999999999995 + ], + "texture": "#booster" + } + }, + "rotation": { + "angle": 45, + "axis": "z", + "origin": [ + 8.0, + 8.0, + 5.0 + ] + } + }, + { + "from": [ + 9.98, + 7.65, + 22.0 + ], + "to": [ + 12.84, + 8.35, + 28.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 2.8599999999999994, + 0.6999999999999993 ], "texture": "#missile_grey" }, @@ -440,8 +905,8 @@ "uv": [ 0, 0, - 3.0, - 0.6000000000000005 + 2.8599999999999994, + 0.6999999999999993 ], "texture": "#missile_grey" }, @@ -450,7 +915,7 @@ 0, 0, 6.0, - 0.6000000000000005 + 0.6999999999999993 ], "texture": "#missile_grey" }, @@ -459,7 +924,7 @@ 0, 0, 6.0, - 0.6000000000000005 + 0.6999999999999993 ], "texture": "#missile_grey" }, @@ -467,7 +932,7 @@ "uv": [ 0, 0, - 3.0, + 2.8599999999999994, 6.0 ], "texture": "#missile_grey" @@ -476,7 +941,7 @@ "uv": [ 0, 0, - 3.0, + 2.8599999999999994, 6.0 ], "texture": "#missile_grey" @@ -485,22 +950,22 @@ }, { "from": [ - 10.0, - 7.7, - 24.0 + 3.16, + 7.65, + 22.0 ], "to": [ - 13.0, - 8.3, - 30.0 + 6.02, + 8.35, + 28.0 ], "faces": { "north": { "uv": [ 0, 0, - 3.0, - 0.6000000000000005 + 2.8599999999999994, + 0.6999999999999993 ], "texture": "#missile_grey" }, @@ -508,8 +973,8 @@ "uv": [ 0, 0, - 3.0, - 0.6000000000000005 + 2.8599999999999994, + 0.6999999999999993 ], "texture": "#missile_grey" }, @@ -518,7 +983,7 @@ 0, 0, 6.0, - 0.6000000000000005 + 0.6999999999999993 ], "texture": "#missile_grey" }, @@ -527,7 +992,7 @@ 0, 0, 6.0, - 0.6000000000000005 + 0.6999999999999993 ], "texture": "#missile_grey" }, @@ -535,7 +1000,7 @@ "uv": [ 0, 0, - 3.0, + 2.8599999999999994, 6.0 ], "texture": "#missile_grey" @@ -544,7 +1009,7 @@ "uv": [ 0, 0, - 3.0, + 2.8599999999999994, 6.0 ], "texture": "#missile_grey" @@ -553,22 +1018,22 @@ }, { "from": [ - 7.7, - 3.0, - 24.0 + 12.84, + 7.65, + 25.0 ], "to": [ - 8.3, - 6.0, - 30.0 + 15.18, + 8.35, + 28.0 ], "faces": { "north": { "uv": [ 0, 0, - 0.6000000000000005, - 3.0 + 2.34, + 0.6999999999999993 ], "texture": "#missile_grey" }, @@ -576,17 +1041,153 @@ "uv": [ 0, 0, - 0.6000000000000005, + 2.34, + 0.6999999999999993 + ], + "texture": "#missile_grey" + }, + "east": { + "uv": [ + 0, + 0, + 3.0, + 0.6999999999999993 + ], + "texture": "#missile_grey" + }, + "west": { + "uv": [ + 0, + 0, + 3.0, + 0.6999999999999993 + ], + "texture": "#missile_grey" + }, + "up": { + "uv": [ + 0, + 0, + 2.34, 3.0 ], "texture": "#missile_grey" }, + "down": { + "uv": [ + 0, + 0, + 2.34, + 3.0 + ], + "texture": "#missile_grey" + } + } + }, + { + "from": [ + 0.8200000000000003, + 7.65, + 25.0 + ], + "to": [ + 3.16, + 8.35, + 28.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 2.34, + 0.6999999999999993 + ], + "texture": "#missile_grey" + }, + "south": { + "uv": [ + 0, + 0, + 2.34, + 0.6999999999999993 + ], + "texture": "#missile_grey" + }, + "east": { + "uv": [ + 0, + 0, + 3.0, + 0.6999999999999993 + ], + "texture": "#missile_grey" + }, + "west": { + "uv": [ + 0, + 0, + 3.0, + 0.6999999999999993 + ], + "texture": "#missile_grey" + }, + "up": { + "uv": [ + 0, + 0, + 2.34, + 3.0 + ], + "texture": "#missile_grey" + }, + "down": { + "uv": [ + 0, + 0, + 2.34, + 3.0 + ], + "texture": "#missile_grey" + } + } + }, + { + "from": [ + 7.65, + 9.98, + 22.0 + ], + "to": [ + 8.35, + 12.84, + 28.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 2.8599999999999994 + ], + "texture": "#missile_grey" + }, + "south": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 2.8599999999999994 + ], + "texture": "#missile_grey" + }, "east": { "uv": [ 0, 0, 6.0, - 3.0 + 2.8599999999999994 ], "texture": "#missile_grey" }, @@ -595,7 +1196,7 @@ 0, 0, 6.0, - 3.0 + 2.8599999999999994 ], "texture": "#missile_grey" }, @@ -603,7 +1204,7 @@ "uv": [ 0, 0, - 0.6000000000000005, + 0.6999999999999993, 6.0 ], "texture": "#missile_grey" @@ -612,7 +1213,7 @@ "uv": [ 0, 0, - 0.6000000000000005, + 0.6999999999999993, 6.0 ], "texture": "#missile_grey" @@ -621,22 +1222,22 @@ }, { "from": [ - 7.7, - 10.0, - 24.0 + 7.65, + 12.84, + 25.0 ], "to": [ - 8.3, - 13.0, - 30.0 + 8.35, + 15.18, + 28.0 ], "faces": { "north": { "uv": [ 0, 0, - 0.6000000000000005, - 3.0 + 0.6999999999999993, + 2.34 ], "texture": "#missile_grey" }, @@ -644,17 +1245,85 @@ "uv": [ 0, 0, - 0.6000000000000005, + 0.6999999999999993, + 2.34 + ], + "texture": "#missile_grey" + }, + "east": { + "uv": [ + 0, + 0, + 3.0, + 2.34 + ], + "texture": "#missile_grey" + }, + "west": { + "uv": [ + 0, + 0, + 3.0, + 2.34 + ], + "texture": "#missile_grey" + }, + "up": { + "uv": [ + 0, + 0, + 0.6999999999999993, 3.0 ], "texture": "#missile_grey" }, + "down": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 3.0 + ], + "texture": "#missile_grey" + } + } + }, + { + "from": [ + 7.65, + 3.1599999999999993, + 22.0 + ], + "to": [ + 8.35, + 6.02, + 28.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 2.8600000000000003 + ], + "texture": "#missile_grey" + }, + "south": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 2.8600000000000003 + ], + "texture": "#missile_grey" + }, "east": { "uv": [ 0, 0, 6.0, - 3.0 + 2.8600000000000003 ], "texture": "#missile_grey" }, @@ -663,7 +1332,7 @@ 0, 0, 6.0, - 3.0 + 2.8600000000000003 ], "texture": "#missile_grey" }, @@ -671,7 +1340,7 @@ "uv": [ 0, 0, - 0.6000000000000005, + 0.6999999999999993, 6.0 ], "texture": "#missile_grey" @@ -680,12 +1349,216 @@ "uv": [ 0, 0, - 0.6000000000000005, + 0.6999999999999993, 6.0 ], "texture": "#missile_grey" } } + }, + { + "from": [ + 7.65, + 0.8199999999999994, + 25.0 + ], + "to": [ + 8.35, + 3.1599999999999993, + 28.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 2.34 + ], + "texture": "#missile_grey" + }, + "south": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 2.34 + ], + "texture": "#missile_grey" + }, + "east": { + "uv": [ + 0, + 0, + 3.0, + 2.34 + ], + "texture": "#missile_grey" + }, + "west": { + "uv": [ + 0, + 0, + 3.0, + 2.34 + ], + "texture": "#missile_grey" + }, + "up": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 3.0 + ], + "texture": "#missile_grey" + }, + "down": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 3.0 + ], + "texture": "#missile_grey" + } + } + }, + { + "from": [ + 6.24, + 6.24, + 28.0 + ], + "to": [ + 9.76, + 9.76, + 29.6 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.5199999999999996, + 3.5199999999999996 + ], + "texture": "#bare_nozzle" + }, + "south": { + "uv": [ + 0, + 0, + 3.5199999999999996, + 3.5199999999999996 + ], + "texture": "#bare_nozzle" + }, + "east": { + "uv": [ + 0, + 0, + 1.6000000000000014, + 3.5199999999999996 + ], + "texture": "#bare_nozzle" + }, + "west": { + "uv": [ + 0, + 0, + 1.6000000000000014, + 3.5199999999999996 + ], + "texture": "#bare_nozzle" + }, + "up": { + "uv": [ + 0, + 0, + 3.5199999999999996, + 1.6000000000000014 + ], + "texture": "#bare_nozzle" + }, + "down": { + "uv": [ + 0, + 0, + 3.5199999999999996, + 1.6000000000000014 + ], + "texture": "#bare_nozzle" + } + } + }, + { + "from": [ + 6.79, + 6.79, + 29.6 + ], + "to": [ + 9.21, + 9.21, + 29.9 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 2.420000000000001, + 2.420000000000001 + ], + "texture": "#glow_ember" + }, + "south": { + "uv": [ + 0, + 0, + 2.420000000000001, + 2.420000000000001 + ], + "texture": "#glow_ember" + }, + "east": { + "uv": [ + 0, + 0, + 0.29999999999999716, + 2.420000000000001 + ], + "texture": "#glow_ember" + }, + "west": { + "uv": [ + 0, + 0, + 0.29999999999999716, + 2.420000000000001 + ], + "texture": "#glow_ember" + }, + "up": { + "uv": [ + 0, + 0, + 2.420000000000001, + 0.29999999999999716 + ], + "texture": "#glow_ember" + }, + "down": { + "uv": [ + 0, + 0, + 2.420000000000001, + 0.29999999999999716 + ], + "texture": "#glow_ember" + } + } } ] } \ No newline at end of file diff --git a/airdef-mod/assets/airdef/models/block/nasams_launcher.json b/airdef-mod/assets/airdef/models/block/nasams_launcher.json index 845cd0e..362338c 100644 --- a/airdef-mod/assets/airdef/models/block/nasams_launcher.json +++ b/airdef-mod/assets/airdef/models/block/nasams_launcher.json @@ -1,10 +1,10 @@ { "ambientocclusion": false, "textures": { - "canister": "airdef:block/canister", "tube_cap": "airdef:block/tube_cap", + "canister": "airdef:block/canister", "dark_metal": "airdef:block/dark_metal", - "particle": "airdef:block/canister" + "particle": "airdef:block/tube_cap" }, "elements": [ { diff --git a/airdef-mod/assets/airdef/models/block/nasams_launcher_burnt.json b/airdef-mod/assets/airdef/models/block/nasams_launcher_burnt.json new file mode 100644 index 0000000..795504a --- /dev/null +++ b/airdef-mod/assets/airdef/models/block/nasams_launcher_burnt.json @@ -0,0 +1,555 @@ +{ + "ambientocclusion": false, + "textures": { + "tube_cap_b": "airdef:block/tube_cap_b", + "canister_b": "airdef:block/canister_b", + "dark_metal_b": "airdef:block/dark_metal_b", + "particle": "airdef:block/tube_cap_b" + }, + "elements": [ + { + "from": [ + 1.0, + 0.0, + -16.0 + ], + "to": [ + 5.0, + 4.0, + 32.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 4.0, + 4.0 + ], + "texture": "#tube_cap_b" + }, + "south": { + "uv": [ + 0, + 0, + 4.0, + 4.0 + ], + "texture": "#tube_cap_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#canister_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#canister_b" + }, + "up": { + "uv": [ + 0, + 0, + 4.0, + 16 + ], + "texture": "#canister_b" + }, + "down": { + "uv": [ + 0, + 0, + 4.0, + 16 + ], + "texture": "#canister_b" + } + } + }, + { + "from": [ + 1.0, + 5.0, + -16.0 + ], + "to": [ + 5.0, + 9.0, + 32.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 4.0, + 4.0 + ], + "texture": "#tube_cap_b" + }, + "south": { + "uv": [ + 0, + 0, + 4.0, + 4.0 + ], + "texture": "#tube_cap_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#canister_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#canister_b" + }, + "up": { + "uv": [ + 0, + 0, + 4.0, + 16 + ], + "texture": "#canister_b" + }, + "down": { + "uv": [ + 0, + 0, + 4.0, + 16 + ], + "texture": "#canister_b" + } + } + }, + { + "from": [ + 6.0, + 0.0, + -16.0 + ], + "to": [ + 10.0, + 4.0, + 32.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 4.0, + 4.0 + ], + "texture": "#tube_cap_b" + }, + "south": { + "uv": [ + 0, + 0, + 4.0, + 4.0 + ], + "texture": "#tube_cap_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#canister_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#canister_b" + }, + "up": { + "uv": [ + 0, + 0, + 4.0, + 16 + ], + "texture": "#canister_b" + }, + "down": { + "uv": [ + 0, + 0, + 4.0, + 16 + ], + "texture": "#canister_b" + } + } + }, + { + "from": [ + 6.0, + 5.0, + -16.0 + ], + "to": [ + 10.0, + 9.0, + 32.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 4.0, + 4.0 + ], + "texture": "#tube_cap_b" + }, + "south": { + "uv": [ + 0, + 0, + 4.0, + 4.0 + ], + "texture": "#tube_cap_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#canister_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#canister_b" + }, + "up": { + "uv": [ + 0, + 0, + 4.0, + 16 + ], + "texture": "#canister_b" + }, + "down": { + "uv": [ + 0, + 0, + 4.0, + 16 + ], + "texture": "#canister_b" + } + } + }, + { + "from": [ + 11.0, + 0.0, + -16.0 + ], + "to": [ + 15.0, + 4.0, + 32.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 4.0, + 4.0 + ], + "texture": "#tube_cap_b" + }, + "south": { + "uv": [ + 0, + 0, + 4.0, + 4.0 + ], + "texture": "#tube_cap_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#canister_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#canister_b" + }, + "up": { + "uv": [ + 0, + 0, + 4.0, + 16 + ], + "texture": "#canister_b" + }, + "down": { + "uv": [ + 0, + 0, + 4.0, + 16 + ], + "texture": "#canister_b" + } + } + }, + { + "from": [ + 11.0, + 5.0, + -16.0 + ], + "to": [ + 15.0, + 9.0, + 32.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 4.0, + 4.0 + ], + "texture": "#tube_cap_b" + }, + "south": { + "uv": [ + 0, + 0, + 4.0, + 4.0 + ], + "texture": "#tube_cap_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#canister_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#canister_b" + }, + "up": { + "uv": [ + 0, + 0, + 4.0, + 16 + ], + "texture": "#canister_b" + }, + "down": { + "uv": [ + 0, + 0, + 4.0, + 16 + ], + "texture": "#canister_b" + } + } + }, + { + "from": [ + 0.0, + 0.0, + 26.0 + ], + "to": [ + 16.0, + 9.0, + 28.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 9.0 + ], + "texture": "#dark_metal_b" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 9.0 + ], + "texture": "#dark_metal_b" + }, + "east": { + "uv": [ + 0, + 0, + 2.0, + 9.0 + ], + "texture": "#dark_metal_b" + }, + "west": { + "uv": [ + 0, + 0, + 2.0, + 9.0 + ], + "texture": "#dark_metal_b" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 2.0 + ], + "texture": "#dark_metal_b" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 2.0 + ], + "texture": "#dark_metal_b" + } + } + }, + { + "from": [ + 0.0, + 0.0, + -2.0 + ], + "to": [ + 16.0, + 9.0, + 0.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 9.0 + ], + "texture": "#dark_metal_b" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 9.0 + ], + "texture": "#dark_metal_b" + }, + "east": { + "uv": [ + 0, + 0, + 2.0, + 9.0 + ], + "texture": "#dark_metal_b" + }, + "west": { + "uv": [ + 0, + 0, + 2.0, + 9.0 + ], + "texture": "#dark_metal_b" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 2.0 + ], + "texture": "#dark_metal_b" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 2.0 + ], + "texture": "#dark_metal_b" + } + } + } + ] +} \ No newline at end of file diff --git a/airdef-mod/assets/airdef/models/block/nasams_trailer.json b/airdef-mod/assets/airdef/models/block/nasams_trailer.json index d7b1b84..9709636 100644 --- a/airdef-mod/assets/airdef/models/block/nasams_trailer.json +++ b/airdef-mod/assets/airdef/models/block/nasams_trailer.json @@ -1,11 +1,13 @@ { "ambientocclusion": false, "textures": { - "nato_green": "airdef:block/nato_green", + "nato_green_s21": "airdef:block/nato_green_s21", + "nato_green_s22": "airdef:block/nato_green_s22", "dark_metal": "airdef:block/dark_metal", "metal": "airdef:block/metal", "tire": "airdef:block/tire", - "particle": "airdef:block/nato_green" + "hub": "airdef:block/hub", + "particle": "airdef:block/nato_green_s21" }, "elements": [ { @@ -27,7 +29,7 @@ 16, 4.0 ], - "texture": "#nato_green" + "texture": "#nato_green_s21" }, "south": { "uv": [ @@ -36,7 +38,7 @@ 16, 4.0 ], - "texture": "#nato_green" + "texture": "#nato_green_s21" }, "east": { "uv": [ @@ -45,7 +47,7 @@ 16, 4.0 ], - "texture": "#nato_green" + "texture": "#nato_green_s21" }, "west": { "uv": [ @@ -54,7 +56,7 @@ 16, 4.0 ], - "texture": "#nato_green" + "texture": "#nato_green_s21" }, "up": { "uv": [ @@ -63,7 +65,7 @@ 16, 16 ], - "texture": "#nato_green" + "texture": "#nato_green_s22" }, "down": { "uv": [ @@ -72,7 +74,7 @@ 16, 16 ], - "texture": "#nato_green" + "texture": "#nato_green_s22" } } }, @@ -215,13 +217,13 @@ { "from": [ -9.0, - 0.0, - 4.0 + 0.3424499999999995, + 3.3424499999999995 ], "to": [ -5.5, - 9.0, - 11.0 + 8.65755, + 11.65755 ], "faces": { "north": { @@ -229,7 +231,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -238,7 +240,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -246,26 +248,26 @@ "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -274,7 +276,7 @@ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" } @@ -283,13 +285,13 @@ { "from": [ 21.5, - 0.0, - 4.0 + 0.3424499999999995, + 3.3424499999999995 ], "to": [ 25.0, - 9.0, - 11.0 + 8.65755, + 11.65755 ], "faces": { "north": { @@ -297,7 +299,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -306,7 +308,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -314,26 +316,26 @@ "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -342,22 +344,176 @@ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" } } }, + { + "from": [ + -8.97, + 0.3424499999999995, + 3.3424499999999995 + ], + "to": [ + -5.53, + 8.65755, + 11.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -7.25, + 4.5, + 7.5 + ] + } + }, + { + "from": [ + 21.53, + 0.3424499999999995, + 3.3424499999999995 + ], + "to": [ + 24.97, + 8.65755, + 11.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 23.25, + 4.5, + 7.5 + ] + } + }, { "from": [ -9.0, - 0.0, - 14.0 + 0.3424499999999995, + 13.34245 ], "to": [ -5.5, - 9.0, - 21.0 + 8.65755, + 21.65755 ], "faces": { "north": { @@ -365,7 +521,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -374,7 +530,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -382,26 +538,26 @@ "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -410,7 +566,7 @@ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" } @@ -419,13 +575,13 @@ { "from": [ 21.5, - 0.0, - 14.0 + 0.3424499999999995, + 13.34245 ], "to": [ 25.0, - 9.0, - 21.0 + 8.65755, + 21.65755 ], "faces": { "north": { @@ -433,7 +589,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -442,7 +598,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -450,26 +606,26 @@ "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -478,11 +634,165 @@ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" } } + }, + { + "from": [ + -8.97, + 0.3424499999999995, + 13.34245 + ], + "to": [ + -5.53, + 8.65755, + 21.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -7.25, + 4.5, + 17.5 + ] + } + }, + { + "from": [ + 21.53, + 0.3424499999999995, + 13.34245 + ], + "to": [ + 24.97, + 8.65755, + 21.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 23.25, + 4.5, + 17.5 + ] + } } ] } \ No newline at end of file diff --git a/airdef-mod/assets/airdef/models/block/nasams_trailer_burnt.json b/airdef-mod/assets/airdef/models/block/nasams_trailer_burnt.json new file mode 100644 index 0000000..0ede9e4 --- /dev/null +++ b/airdef-mod/assets/airdef/models/block/nasams_trailer_burnt.json @@ -0,0 +1,798 @@ +{ + "ambientocclusion": false, + "textures": { + "nato_green_s21_b": "airdef:block/nato_green_s21_b", + "nato_green_s22_b": "airdef:block/nato_green_s22_b", + "dark_metal_b": "airdef:block/dark_metal_b", + "metal_b": "airdef:block/metal_b", + "tire_b": "airdef:block/tire_b", + "hub_b": "airdef:block/hub_b", + "particle": "airdef:block/nato_green_s21_b" + }, + "elements": [ + { + "from": [ + -6.0, + 5.0, + -10.0 + ], + "to": [ + 22.0, + 9.0, + 26.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#nato_green_s21_b" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#nato_green_s21_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#nato_green_s21_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#nato_green_s21_b" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#nato_green_s22_b" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#nato_green_s22_b" + } + } + }, + { + "from": [ + -4.0, + 9.0, + 10.0 + ], + "to": [ + 20.0, + 13.0, + 24.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#dark_metal_b" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#dark_metal_b" + }, + "east": { + "uv": [ + 0, + 0, + 14.0, + 4.0 + ], + "texture": "#dark_metal_b" + }, + "west": { + "uv": [ + 0, + 0, + 14.0, + 4.0 + ], + "texture": "#dark_metal_b" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 14.0 + ], + "texture": "#dark_metal_b" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 14.0 + ], + "texture": "#dark_metal_b" + } + } + }, + { + "from": [ + 6.0, + 3.0, + -16.0 + ], + "to": [ + 10.0, + 6.0, + -10.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 4.0, + 3.0 + ], + "texture": "#metal_b" + }, + "south": { + "uv": [ + 0, + 0, + 4.0, + 3.0 + ], + "texture": "#metal_b" + }, + "east": { + "uv": [ + 0, + 0, + 6.0, + 3.0 + ], + "texture": "#metal_b" + }, + "west": { + "uv": [ + 0, + 0, + 6.0, + 3.0 + ], + "texture": "#metal_b" + }, + "up": { + "uv": [ + 0, + 0, + 4.0, + 6.0 + ], + "texture": "#metal_b" + }, + "down": { + "uv": [ + 0, + 0, + 4.0, + 6.0 + ], + "texture": "#metal_b" + } + } + }, + { + "from": [ + -9.0, + 0.3424499999999995, + 3.3424499999999995 + ], + "to": [ + -5.5, + 8.65755, + 11.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + } + } + }, + { + "from": [ + 21.5, + 0.3424499999999995, + 3.3424499999999995 + ], + "to": [ + 25.0, + 8.65755, + 11.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + } + } + }, + { + "from": [ + -8.97, + 0.3424499999999995, + 3.3424499999999995 + ], + "to": [ + -5.53, + 8.65755, + 11.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -7.25, + 4.5, + 7.5 + ] + } + }, + { + "from": [ + 21.53, + 0.3424499999999995, + 3.3424499999999995 + ], + "to": [ + 24.97, + 8.65755, + 11.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 23.25, + 4.5, + 7.5 + ] + } + }, + { + "from": [ + -9.0, + 0.3424499999999995, + 13.34245 + ], + "to": [ + -5.5, + 8.65755, + 21.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + } + } + }, + { + "from": [ + 21.5, + 0.3424499999999995, + 13.34245 + ], + "to": [ + 25.0, + 8.65755, + 21.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + } + } + }, + { + "from": [ + -8.97, + 0.3424499999999995, + 13.34245 + ], + "to": [ + -5.53, + 8.65755, + 21.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -7.25, + 4.5, + 17.5 + ] + } + }, + { + "from": [ + 21.53, + 0.3424499999999995, + 13.34245 + ], + "to": [ + 24.97, + 8.65755, + 21.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 23.25, + 4.5, + 17.5 + ] + } + } + ] +} \ No newline at end of file diff --git a/airdef-mod/assets/airdef/models/block/p1sun_launcher.json b/airdef-mod/assets/airdef/models/block/p1sun_launcher.json index 1c97559..ab59635 100644 --- a/airdef-mod/assets/airdef/models/block/p1sun_launcher.json +++ b/airdef-mod/assets/airdef/models/block/p1sun_launcher.json @@ -1,9 +1,9 @@ { "ambientocclusion": false, "textures": { - "dark_metal": "airdef:block/dark_metal", "tube_cap": "airdef:block/tube_cap", - "particle": "airdef:block/dark_metal" + "dark_metal": "airdef:block/dark_metal", + "particle": "airdef:block/tube_cap" }, "elements": [ { diff --git a/airdef-mod/assets/airdef/models/block/p1sun_launcher_burnt.json b/airdef-mod/assets/airdef/models/block/p1sun_launcher_burnt.json new file mode 100644 index 0000000..9c4ab98 --- /dev/null +++ b/airdef-mod/assets/airdef/models/block/p1sun_launcher_burnt.json @@ -0,0 +1,690 @@ +{ + "ambientocclusion": false, + "textures": { + "tube_cap_b": "airdef:block/tube_cap_b", + "dark_metal_b": "airdef:block/dark_metal_b", + "particle": "airdef:block/tube_cap_b" + }, + "elements": [ + { + "from": [ + 0.5, + 0.0, + -16.0 + ], + "to": [ + 3.5, + 3.0, + 32.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.0, + 3.0 + ], + "texture": "#tube_cap_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.0, + 3.0 + ], + "texture": "#tube_cap_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 3.0 + ], + "texture": "#dark_metal_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 3.0 + ], + "texture": "#dark_metal_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.0, + 16 + ], + "texture": "#dark_metal_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.0, + 16 + ], + "texture": "#dark_metal_b" + } + } + }, + { + "from": [ + 0.5, + 4.0, + -16.0 + ], + "to": [ + 3.5, + 7.0, + 32.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.0, + 3.0 + ], + "texture": "#tube_cap_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.0, + 3.0 + ], + "texture": "#tube_cap_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 3.0 + ], + "texture": "#dark_metal_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 3.0 + ], + "texture": "#dark_metal_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.0, + 16 + ], + "texture": "#dark_metal_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.0, + 16 + ], + "texture": "#dark_metal_b" + } + } + }, + { + "from": [ + 4.5, + 0.0, + -16.0 + ], + "to": [ + 7.5, + 3.0, + 32.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.0, + 3.0 + ], + "texture": "#tube_cap_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.0, + 3.0 + ], + "texture": "#tube_cap_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 3.0 + ], + "texture": "#dark_metal_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 3.0 + ], + "texture": "#dark_metal_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.0, + 16 + ], + "texture": "#dark_metal_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.0, + 16 + ], + "texture": "#dark_metal_b" + } + } + }, + { + "from": [ + 4.5, + 4.0, + -16.0 + ], + "to": [ + 7.5, + 7.0, + 32.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.0, + 3.0 + ], + "texture": "#tube_cap_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.0, + 3.0 + ], + "texture": "#tube_cap_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 3.0 + ], + "texture": "#dark_metal_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 3.0 + ], + "texture": "#dark_metal_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.0, + 16 + ], + "texture": "#dark_metal_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.0, + 16 + ], + "texture": "#dark_metal_b" + } + } + }, + { + "from": [ + 8.5, + 0.0, + -16.0 + ], + "to": [ + 11.5, + 3.0, + 32.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.0, + 3.0 + ], + "texture": "#tube_cap_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.0, + 3.0 + ], + "texture": "#tube_cap_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 3.0 + ], + "texture": "#dark_metal_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 3.0 + ], + "texture": "#dark_metal_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.0, + 16 + ], + "texture": "#dark_metal_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.0, + 16 + ], + "texture": "#dark_metal_b" + } + } + }, + { + "from": [ + 8.5, + 4.0, + -16.0 + ], + "to": [ + 11.5, + 7.0, + 32.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.0, + 3.0 + ], + "texture": "#tube_cap_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.0, + 3.0 + ], + "texture": "#tube_cap_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 3.0 + ], + "texture": "#dark_metal_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 3.0 + ], + "texture": "#dark_metal_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.0, + 16 + ], + "texture": "#dark_metal_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.0, + 16 + ], + "texture": "#dark_metal_b" + } + } + }, + { + "from": [ + 12.5, + 0.0, + -16.0 + ], + "to": [ + 15.5, + 3.0, + 32.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.0, + 3.0 + ], + "texture": "#tube_cap_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.0, + 3.0 + ], + "texture": "#tube_cap_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 3.0 + ], + "texture": "#dark_metal_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 3.0 + ], + "texture": "#dark_metal_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.0, + 16 + ], + "texture": "#dark_metal_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.0, + 16 + ], + "texture": "#dark_metal_b" + } + } + }, + { + "from": [ + 12.5, + 4.0, + -16.0 + ], + "to": [ + 15.5, + 7.0, + 32.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.0, + 3.0 + ], + "texture": "#tube_cap_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.0, + 3.0 + ], + "texture": "#tube_cap_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 3.0 + ], + "texture": "#dark_metal_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 3.0 + ], + "texture": "#dark_metal_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.0, + 16 + ], + "texture": "#dark_metal_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.0, + 16 + ], + "texture": "#dark_metal_b" + } + } + }, + { + "from": [ + -0.5, + 0.0, + 26.0 + ], + "to": [ + 16.5, + 7.0, + 28.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 7.0 + ], + "texture": "#dark_metal_b" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 7.0 + ], + "texture": "#dark_metal_b" + }, + "east": { + "uv": [ + 0, + 0, + 2.0, + 7.0 + ], + "texture": "#dark_metal_b" + }, + "west": { + "uv": [ + 0, + 0, + 2.0, + 7.0 + ], + "texture": "#dark_metal_b" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 2.0 + ], + "texture": "#dark_metal_b" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 2.0 + ], + "texture": "#dark_metal_b" + } + } + }, + { + "from": [ + -0.5, + 0.0, + -2.0 + ], + "to": [ + 16.5, + 7.0, + 0.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 7.0 + ], + "texture": "#dark_metal_b" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 7.0 + ], + "texture": "#dark_metal_b" + }, + "east": { + "uv": [ + 0, + 0, + 2.0, + 7.0 + ], + "texture": "#dark_metal_b" + }, + "west": { + "uv": [ + 0, + 0, + 2.0, + 7.0 + ], + "texture": "#dark_metal_b" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 2.0 + ], + "texture": "#dark_metal_b" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 2.0 + ], + "texture": "#dark_metal_b" + } + } + } + ] +} \ No newline at end of file diff --git a/airdef-mod/assets/airdef/models/block/pac3.json b/airdef-mod/assets/airdef/models/block/pac3.json index bcb9d36..542aee1 100644 --- a/airdef-mod/assets/airdef/models/block/pac3.json +++ b/airdef-mod/assets/airdef/models/block/pac3.json @@ -1,301 +1,759 @@ { "ambientocclusion": false, "textures": { + "nose_dark": "airdef:block/nose_dark", + "rm_pac3": "airdef:block/rm_pac3", + "rm_pac3_t": "airdef:block/rm_pac3_t", + "dark_metal": "airdef:block/dark_metal", "missile": "airdef:block/missile", - "nozzle": "airdef:block/nozzle", - "particle": "airdef:block/missile" + "bare_nozzle": "airdef:block/bare_nozzle", + "glow_ember": "airdef:block/glow_ember", + "particle": "airdef:block/nose_dark" }, "elements": [ { "from": [ - 7.333333333333333, - 7.333333333333333, + 7.294558312447602, + 7.294558312447602, -16.0 ], "to": [ - 8.666666666666666, - 8.666666666666666, - -14.333333333333334 + 8.705441687552398, + 8.705441687552398, + -13.666666666666666 ], "faces": { "north": { "uv": [ 0, 0, - 1.333333333333333, - 1.333333333333333 + 1.4108833751047953, + 1.4108833751047953 ], - "texture": "#missile" + "texture": "#nose_dark" }, "south": { "uv": [ 0, 0, - 1.333333333333333, - 1.333333333333333 + 1.4108833751047953, + 1.4108833751047953 ], - "texture": "#missile" + "texture": "#nose_dark" }, "east": { "uv": [ 0, 0, - 1.666666666666666, - 1.333333333333333 + 2.333333333333334, + 1.4108833751047953 ], - "texture": "#missile" + "texture": "#nose_dark" }, "west": { "uv": [ 0, 0, - 1.666666666666666, - 1.333333333333333 + 2.333333333333334, + 1.4108833751047953 ], - "texture": "#missile" + "texture": "#nose_dark" }, "up": { "uv": [ 0, 0, - 1.333333333333333, - 1.666666666666666 + 1.4108833751047953, + 2.333333333333334 ], - "texture": "#missile" + "texture": "#nose_dark" }, "down": { "uv": [ 0, 0, - 1.333333333333333, - 1.666666666666666 + 1.4108833751047953, + 2.333333333333334 ], - "texture": "#missile" + "texture": "#nose_dark" } } }, { "from": [ - 7.0, - 7.0, - -14.333333333333334 + 7.294558312447602, + 7.294558312447602, + -15.97 ], "to": [ - 9.0, - 9.0, - -12.666666666666666 + 8.705441687552398, + 8.705441687552398, + -13.696666666666665 ], "faces": { "north": { "uv": [ 0, 0, - 2.0, - 2.0 + 1.4108833751047953, + 1.4108833751047953 ], - "texture": "#missile" + "texture": "#nose_dark" }, "south": { "uv": [ 0, 0, - 2.0, - 2.0 + 1.4108833751047953, + 1.4108833751047953 ], - "texture": "#missile" + "texture": "#nose_dark" }, "east": { "uv": [ 0, 0, - 1.6666666666666679, - 2.0 + 2.273333333333335, + 1.4108833751047953 ], - "texture": "#missile" + "texture": "#nose_dark" }, "west": { "uv": [ 0, 0, - 1.6666666666666679, - 2.0 + 2.273333333333335, + 1.4108833751047953 ], - "texture": "#missile" + "texture": "#nose_dark" }, "up": { "uv": [ 0, 0, - 2.0, - 1.6666666666666679 + 1.4108833751047953, + 2.273333333333335 ], - "texture": "#missile" + "texture": "#nose_dark" }, "down": { "uv": [ 0, 0, - 2.0, - 1.6666666666666679 + 1.4108833751047953, + 2.273333333333335 ], - "texture": "#missile" + "texture": "#nose_dark" } + }, + "rotation": { + "angle": 45, + "axis": "z", + "origin": [ + 8.0, + 8.0, + -14.833333333333332 + ] } }, { "from": [ - 6.666666666666666, - 6.666666666666666, - -12.666666666666666 + 6.8507775398726425, + 6.8507775398726425, + -13.666666666666666 ], "to": [ - 9.333333333333334, - 9.333333333333334, - -11.0 + 9.149222460127358, + 9.149222460127358, + -11.333333333333332 ], "faces": { "north": { "uv": [ 0, 0, - 2.666666666666668, - 2.666666666666668 + 2.298444920254716, + 2.298444920254716 ], - "texture": "#missile" + "texture": "#nose_dark" }, "south": { "uv": [ 0, 0, - 2.666666666666668, - 2.666666666666668 + 2.298444920254716, + 2.298444920254716 ], - "texture": "#missile" + "texture": "#nose_dark" }, "east": { "uv": [ 0, 0, - 1.666666666666666, - 2.666666666666668 + 2.333333333333334, + 2.298444920254716 ], - "texture": "#missile" + "texture": "#nose_dark" }, "west": { "uv": [ 0, 0, - 1.666666666666666, - 2.666666666666668 + 2.333333333333334, + 2.298444920254716 ], - "texture": "#missile" + "texture": "#nose_dark" }, "up": { "uv": [ 0, 0, - 2.666666666666668, - 1.666666666666666 + 2.298444920254716, + 2.333333333333334 ], - "texture": "#missile" + "texture": "#nose_dark" }, "down": { "uv": [ 0, 0, - 2.666666666666668, - 1.666666666666666 + 2.298444920254716, + 2.333333333333334 ], - "texture": "#missile" + "texture": "#nose_dark" } } }, { "from": [ - 6.5, - 6.5, - -11.0 + 6.8507775398726425, + 6.8507775398726425, + -13.636666666666667 ], "to": [ - 9.5, - 9.5, - 26.0 + 9.149222460127358, + 9.149222460127358, + -11.363333333333332 ], "faces": { "north": { "uv": [ 0, 0, - 3.0, - 3.0 + 2.298444920254716, + 2.298444920254716 ], - "texture": "#missile" + "texture": "#nose_dark" }, "south": { "uv": [ 0, 0, - 3.0, - 3.0 + 2.298444920254716, + 2.298444920254716 ], - "texture": "#missile" + "texture": "#nose_dark" + }, + "east": { + "uv": [ + 0, + 0, + 2.273333333333335, + 2.298444920254716 + ], + "texture": "#nose_dark" + }, + "west": { + "uv": [ + 0, + 0, + 2.273333333333335, + 2.298444920254716 + ], + "texture": "#nose_dark" + }, + "up": { + "uv": [ + 0, + 0, + 2.298444920254716, + 2.273333333333335 + ], + "texture": "#nose_dark" + }, + "down": { + "uv": [ + 0, + 0, + 2.298444920254716, + 2.273333333333335 + ], + "texture": "#nose_dark" + } + }, + "rotation": { + "angle": 45, + "axis": "z", + "origin": [ + 8.0, + 8.0, + -12.5 + ] + } + }, + { + "from": [ + 6.517798430927714, + 6.517798430927714, + -11.333333333333332 + ], + "to": [ + 9.482201569072286, + 9.482201569072286, + -9.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 2.964403138144572, + 2.964403138144572 + ], + "texture": "#nose_dark" + }, + "south": { + "uv": [ + 0, + 0, + 2.964403138144572, + 2.964403138144572 + ], + "texture": "#nose_dark" + }, + "east": { + "uv": [ + 0, + 0, + 2.333333333333332, + 2.964403138144572 + ], + "texture": "#nose_dark" + }, + "west": { + "uv": [ + 0, + 0, + 2.333333333333332, + 2.964403138144572 + ], + "texture": "#nose_dark" + }, + "up": { + "uv": [ + 0, + 0, + 2.964403138144572, + 2.333333333333332 + ], + "texture": "#nose_dark" + }, + "down": { + "uv": [ + 0, + 0, + 2.964403138144572, + 2.333333333333332 + ], + "texture": "#nose_dark" + } + } + }, + { + "from": [ + 6.517798430927714, + 6.517798430927714, + -11.303333333333333 + ], + "to": [ + 9.482201569072286, + 9.482201569072286, + -9.03 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 2.964403138144572, + 2.964403138144572 + ], + "texture": "#nose_dark" + }, + "south": { + "uv": [ + 0, + 0, + 2.964403138144572, + 2.964403138144572 + ], + "texture": "#nose_dark" + }, + "east": { + "uv": [ + 0, + 0, + 2.2733333333333334, + 2.964403138144572 + ], + "texture": "#nose_dark" + }, + "west": { + "uv": [ + 0, + 0, + 2.2733333333333334, + 2.964403138144572 + ], + "texture": "#nose_dark" + }, + "up": { + "uv": [ + 0, + 0, + 2.964403138144572, + 2.2733333333333334 + ], + "texture": "#nose_dark" + }, + "down": { + "uv": [ + 0, + 0, + 2.964403138144572, + 2.2733333333333334 + ], + "texture": "#nose_dark" + } + }, + "rotation": { + "angle": 45, + "axis": "z", + "origin": [ + 8.0, + 8.0, + -10.166666666666666 + ] + } + }, + { + "from": [ + 6.4293700000000005, + 6.4293700000000005, + -9.0 + ], + "to": [ + 9.57063, + 9.57063, + 24.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.141259999999999, + 3.141259999999999 + ], + "texture": "#rm_pac3" + }, + "south": { + "uv": [ + 0, + 0, + 3.141259999999999, + 3.141259999999999 + ], + "texture": "#rm_pac3" }, "east": { "uv": [ 0, 0, 16, - 3.0 + 3.141259999999999 ], - "texture": "#missile" + "texture": "#rm_pac3" }, "west": { "uv": [ 0, 0, 16, - 3.0 + 3.141259999999999 ], - "texture": "#missile" + "texture": "#rm_pac3" }, "up": { "uv": [ 0, 0, - 3.0, + 3.141259999999999, 16 ], - "texture": "#missile" + "texture": "#rm_pac3_t" }, "down": { "uv": [ 0, 0, - 3.0, + 3.141259999999999, 16 ], - "texture": "#missile" + "texture": "#rm_pac3_t" } } }, { "from": [ - 1.5, - 7.6, - 20.0 + 6.4293700000000005, + 6.4293700000000005, + -8.97 ], "to": [ - 6.5, - 8.4, - 26.0 + 9.57063, + 9.57063, + 23.97 ], "faces": { "north": { "uv": [ 0, 0, - 5.0, - 0.8000000000000007 + 3.141259999999999, + 3.141259999999999 + ], + "texture": "#rm_pac3" + }, + "south": { + "uv": [ + 0, + 0, + 3.141259999999999, + 3.141259999999999 + ], + "texture": "#rm_pac3" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 3.141259999999999 + ], + "texture": "#rm_pac3" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 3.141259999999999 + ], + "texture": "#rm_pac3" + }, + "up": { + "uv": [ + 0, + 0, + 3.141259999999999, + 16 + ], + "texture": "#rm_pac3_t" + }, + "down": { + "uv": [ + 0, + 0, + 3.141259999999999, + 16 + ], + "texture": "#rm_pac3_t" + } + }, + "rotation": { + "angle": 45, + "axis": "z", + "origin": [ + 8.0, + 8.0, + 7.499999999999999 + ] + } + }, + { + "from": [ + 5.96742, + 5.96742, + -8.0 + ], + "to": [ + 10.03258, + 10.03258, + -7.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 4.06516, + 4.06516 + ], + "texture": "#dark_metal" + }, + "south": { + "uv": [ + 0, + 0, + 4.06516, + 4.06516 + ], + "texture": "#dark_metal" + }, + "east": { + "uv": [ + 0, + 0, + 1.0, + 4.06516 + ], + "texture": "#dark_metal" + }, + "west": { + "uv": [ + 0, + 0, + 1.0, + 4.06516 + ], + "texture": "#dark_metal" + }, + "up": { + "uv": [ + 0, + 0, + 4.06516, + 1.0 + ], + "texture": "#dark_metal" + }, + "down": { + "uv": [ + 0, + 0, + 4.06516, + 1.0 + ], + "texture": "#dark_metal" + } + } + }, + { + "from": [ + 5.96742, + 5.96742, + -7.97 + ], + "to": [ + 10.03258, + 10.03258, + -7.03 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 4.06516, + 4.06516 + ], + "texture": "#dark_metal" + }, + "south": { + "uv": [ + 0, + 0, + 4.06516, + 4.06516 + ], + "texture": "#dark_metal" + }, + "east": { + "uv": [ + 0, + 0, + 0.9399999999999995, + 4.06516 + ], + "texture": "#dark_metal" + }, + "west": { + "uv": [ + 0, + 0, + 0.9399999999999995, + 4.06516 + ], + "texture": "#dark_metal" + }, + "up": { + "uv": [ + 0, + 0, + 4.06516, + 0.9399999999999995 + ], + "texture": "#dark_metal" + }, + "down": { + "uv": [ + 0, + 0, + 4.06516, + 0.9399999999999995 + ], + "texture": "#dark_metal" + } + }, + "rotation": { + "angle": 45, + "axis": "z", + "origin": [ + 8.0, + 8.0, + -7.5 + ] + } + }, + { + "from": [ + 9.53, + 7.65, + 18.0 + ], + "to": [ + 12.280000000000001, + 8.35, + 24.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 2.7500000000000018, + 0.6999999999999993 ], "texture": "#missile" }, @@ -303,8 +761,8 @@ "uv": [ 0, 0, - 5.0, - 0.8000000000000007 + 2.7500000000000018, + 0.6999999999999993 ], "texture": "#missile" }, @@ -313,7 +771,7 @@ 0, 0, 6.0, - 0.8000000000000007 + 0.6999999999999993 ], "texture": "#missile" }, @@ -322,7 +780,7 @@ 0, 0, 6.0, - 0.8000000000000007 + 0.6999999999999993 ], "texture": "#missile" }, @@ -330,7 +788,7 @@ "uv": [ 0, 0, - 5.0, + 2.7500000000000018, 6.0 ], "texture": "#missile" @@ -339,7 +797,7 @@ "uv": [ 0, 0, - 5.0, + 2.7500000000000018, 6.0 ], "texture": "#missile" @@ -348,22 +806,22 @@ }, { "from": [ - 9.5, - 7.6, - 20.0 + 3.719999999999999, + 7.65, + 18.0 ], "to": [ - 14.5, - 8.4, - 26.0 + 6.470000000000001, + 8.35, + 24.0 ], "faces": { "north": { "uv": [ 0, 0, - 5.0, - 0.8000000000000007 + 2.7500000000000018, + 0.6999999999999993 ], "texture": "#missile" }, @@ -371,8 +829,8 @@ "uv": [ 0, 0, - 5.0, - 0.8000000000000007 + 2.7500000000000018, + 0.6999999999999993 ], "texture": "#missile" }, @@ -381,7 +839,7 @@ 0, 0, 6.0, - 0.8000000000000007 + 0.6999999999999993 ], "texture": "#missile" }, @@ -390,7 +848,7 @@ 0, 0, 6.0, - 0.8000000000000007 + 0.6999999999999993 ], "texture": "#missile" }, @@ -398,7 +856,7 @@ "uv": [ 0, 0, - 5.0, + 2.7500000000000018, 6.0 ], "texture": "#missile" @@ -407,7 +865,7 @@ "uv": [ 0, 0, - 5.0, + 2.7500000000000018, 6.0 ], "texture": "#missile" @@ -416,22 +874,22 @@ }, { "from": [ - 7.6, - 1.5, - 20.0 + 12.280000000000001, + 7.65, + 21.5 ], "to": [ - 8.4, - 6.5, - 26.0 + 14.530000000000001, + 8.35, + 24.0 ], "faces": { "north": { "uv": [ 0, 0, - 0.8000000000000007, - 5.0 + 2.25, + 0.6999999999999993 ], "texture": "#missile" }, @@ -439,8 +897,144 @@ "uv": [ 0, 0, - 0.8000000000000007, - 5.0 + 2.25, + 0.6999999999999993 + ], + "texture": "#missile" + }, + "east": { + "uv": [ + 0, + 0, + 2.5, + 0.6999999999999993 + ], + "texture": "#missile" + }, + "west": { + "uv": [ + 0, + 0, + 2.5, + 0.6999999999999993 + ], + "texture": "#missile" + }, + "up": { + "uv": [ + 0, + 0, + 2.25, + 2.5 + ], + "texture": "#missile" + }, + "down": { + "uv": [ + 0, + 0, + 2.25, + 2.5 + ], + "texture": "#missile" + } + } + }, + { + "from": [ + 1.4699999999999989, + 7.65, + 21.5 + ], + "to": [ + 3.719999999999999, + 8.35, + 24.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 2.25, + 0.6999999999999993 + ], + "texture": "#missile" + }, + "south": { + "uv": [ + 0, + 0, + 2.25, + 0.6999999999999993 + ], + "texture": "#missile" + }, + "east": { + "uv": [ + 0, + 0, + 2.5, + 0.6999999999999993 + ], + "texture": "#missile" + }, + "west": { + "uv": [ + 0, + 0, + 2.5, + 0.6999999999999993 + ], + "texture": "#missile" + }, + "up": { + "uv": [ + 0, + 0, + 2.25, + 2.5 + ], + "texture": "#missile" + }, + "down": { + "uv": [ + 0, + 0, + 2.25, + 2.5 + ], + "texture": "#missile" + } + } + }, + { + "from": [ + 7.65, + 9.53, + 18.0 + ], + "to": [ + 8.35, + 12.28, + 24.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 2.75 + ], + "texture": "#missile" + }, + "south": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 2.75 ], "texture": "#missile" }, @@ -449,7 +1043,7 @@ 0, 0, 6.0, - 5.0 + 2.75 ], "texture": "#missile" }, @@ -458,7 +1052,7 @@ 0, 0, 6.0, - 5.0 + 2.75 ], "texture": "#missile" }, @@ -466,7 +1060,7 @@ "uv": [ 0, 0, - 0.8000000000000007, + 0.6999999999999993, 6.0 ], "texture": "#missile" @@ -475,7 +1069,7 @@ "uv": [ 0, 0, - 0.8000000000000007, + 0.6999999999999993, 6.0 ], "texture": "#missile" @@ -484,22 +1078,22 @@ }, { "from": [ - 7.6, - 9.5, - 20.0 + 7.65, + 12.28, + 21.5 ], "to": [ - 8.4, - 14.5, - 26.0 + 8.35, + 14.53, + 24.0 ], "faces": { "north": { "uv": [ 0, 0, - 0.8000000000000007, - 5.0 + 0.6999999999999993, + 2.25 ], "texture": "#missile" }, @@ -507,8 +1101,76 @@ "uv": [ 0, 0, - 0.8000000000000007, - 5.0 + 0.6999999999999993, + 2.25 + ], + "texture": "#missile" + }, + "east": { + "uv": [ + 0, + 0, + 2.5, + 2.25 + ], + "texture": "#missile" + }, + "west": { + "uv": [ + 0, + 0, + 2.5, + 2.25 + ], + "texture": "#missile" + }, + "up": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 2.5 + ], + "texture": "#missile" + }, + "down": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 2.5 + ], + "texture": "#missile" + } + } + }, + { + "from": [ + 7.65, + 3.7199999999999998, + 18.0 + ], + "to": [ + 8.35, + 6.47, + 24.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 2.75 + ], + "texture": "#missile" + }, + "south": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 2.75 ], "texture": "#missile" }, @@ -517,7 +1179,7 @@ 0, 0, 6.0, - 5.0 + 2.75 ], "texture": "#missile" }, @@ -526,7 +1188,7 @@ 0, 0, 6.0, - 5.0 + 2.75 ], "texture": "#missile" }, @@ -534,7 +1196,7 @@ "uv": [ 0, 0, - 0.8000000000000007, + 0.6999999999999993, 6.0 ], "texture": "#missile" @@ -543,7 +1205,7 @@ "uv": [ 0, 0, - 0.8000000000000007, + 0.6999999999999993, 6.0 ], "texture": "#missile" @@ -552,22 +1214,22 @@ }, { "from": [ - 4.5, - 7.7, - -6.0 + 7.65, + 1.4699999999999998, + 21.5 ], "to": [ - 6.5, - 8.3, - -2.0 + 8.35, + 3.7199999999999998, + 24.0 ], "faces": { "north": { "uv": [ 0, 0, - 2.0, - 0.6000000000000005 + 0.6999999999999993, + 2.25 ], "texture": "#missile" }, @@ -575,8 +1237,8 @@ "uv": [ 0, 0, - 2.0, - 0.6000000000000005 + 0.6999999999999993, + 2.25 ], "texture": "#missile" }, @@ -584,8 +1246,8 @@ "uv": [ 0, 0, - 4.0, - 0.6000000000000005 + 2.5, + 2.25 ], "texture": "#missile" }, @@ -593,8 +1255,8 @@ "uv": [ 0, 0, - 4.0, - 0.6000000000000005 + 2.5, + 2.25 ], "texture": "#missile" }, @@ -602,8 +1264,8 @@ "uv": [ 0, 0, - 2.0, - 4.0 + 0.6999999999999993, + 2.5 ], "texture": "#missile" }, @@ -611,8 +1273,8 @@ "uv": [ 0, 0, - 2.0, - 4.0 + 0.6999999999999993, + 2.5 ], "texture": "#missile" } @@ -620,137 +1282,137 @@ }, { "from": [ - 9.5, - 7.7, - -6.0 + 6.64, + 6.64, + 24.0 ], "to": [ - 11.5, - 8.3, - -2.0 + 9.36, + 9.36, + 25.6 ], "faces": { "north": { "uv": [ 0, 0, - 2.0, - 0.6000000000000005 + 2.7199999999999998, + 2.7199999999999998 ], - "texture": "#missile" + "texture": "#bare_nozzle" }, "south": { "uv": [ 0, 0, - 2.0, - 0.6000000000000005 + 2.7199999999999998, + 2.7199999999999998 ], - "texture": "#missile" + "texture": "#bare_nozzle" }, "east": { "uv": [ 0, 0, - 4.0, - 0.6000000000000005 + 1.6000000000000014, + 2.7199999999999998 ], - "texture": "#missile" + "texture": "#bare_nozzle" }, "west": { "uv": [ 0, 0, - 4.0, - 0.6000000000000005 + 1.6000000000000014, + 2.7199999999999998 ], - "texture": "#missile" + "texture": "#bare_nozzle" }, "up": { "uv": [ 0, 0, - 2.0, - 4.0 + 2.7199999999999998, + 1.6000000000000014 ], - "texture": "#missile" + "texture": "#bare_nozzle" }, "down": { "uv": [ 0, 0, - 2.0, - 4.0 + 2.7199999999999998, + 1.6000000000000014 ], - "texture": "#missile" + "texture": "#bare_nozzle" } } }, { "from": [ - 7.0, - 7.0, - 26.0 + 7.0649999999999995, + 7.0649999999999995, + 25.6 ], "to": [ - 9.0, - 9.0, - 28.0 + 8.935, + 8.935, + 25.9 ], "faces": { "north": { "uv": [ 0, 0, - 2.0, - 2.0 + 1.870000000000001, + 1.870000000000001 ], - "texture": "#nozzle" + "texture": "#glow_ember" }, "south": { "uv": [ 0, 0, - 2.0, - 2.0 + 1.870000000000001, + 1.870000000000001 ], - "texture": "#nozzle" + "texture": "#glow_ember" }, "east": { "uv": [ 0, 0, - 2.0, - 2.0 + 0.29999999999999716, + 1.870000000000001 ], - "texture": "#nozzle" + "texture": "#glow_ember" }, "west": { "uv": [ 0, 0, - 2.0, - 2.0 + 0.29999999999999716, + 1.870000000000001 ], - "texture": "#nozzle" + "texture": "#glow_ember" }, "up": { "uv": [ 0, 0, - 2.0, - 2.0 + 1.870000000000001, + 0.29999999999999716 ], - "texture": "#nozzle" + "texture": "#glow_ember" }, "down": { "uv": [ 0, 0, - 2.0, - 2.0 + 1.870000000000001, + 0.29999999999999716 ], - "texture": "#nozzle" + "texture": "#glow_ember" } } } diff --git a/airdef-mod/assets/airdef/models/block/pantsir_pack.json b/airdef-mod/assets/airdef/models/block/pantsir_pack.json index 86474cd..512ee26 100644 --- a/airdef-mod/assets/airdef/models/block/pantsir_pack.json +++ b/airdef-mod/assets/airdef/models/block/pantsir_pack.json @@ -1,11 +1,13 @@ { "ambientocclusion": false, "textures": { - "ru_green": "airdef:block/ru_green", "tubes6": "airdef:block/tubes6", - "barrel": "airdef:block/barrel", + "ru_green": "airdef:block/ru_green", + "ru_green_s21": "airdef:block/ru_green_s21", + "ru_green_s12": "airdef:block/ru_green_s12", + "bare_barrel": "airdef:block/bare_barrel", "dark_metal": "airdef:block/dark_metal", - "particle": "airdef:block/ru_green" + "particle": "airdef:block/tubes6" }, "elements": [ { @@ -45,7 +47,7 @@ 16, 10.0 ], - "texture": "#ru_green" + "texture": "#ru_green_s21" }, "west": { "uv": [ @@ -54,7 +56,7 @@ 16, 10.0 ], - "texture": "#ru_green" + "texture": "#ru_green_s21" }, "up": { "uv": [ @@ -63,7 +65,7 @@ 8.0, 16 ], - "texture": "#ru_green" + "texture": "#ru_green_s12" }, "down": { "uv": [ @@ -72,7 +74,7 @@ 8.0, 16 ], - "texture": "#ru_green" + "texture": "#ru_green_s12" } } }, @@ -113,7 +115,7 @@ 16, 10.0 ], - "texture": "#ru_green" + "texture": "#ru_green_s21" }, "west": { "uv": [ @@ -122,7 +124,7 @@ 16, 10.0 ], - "texture": "#ru_green" + "texture": "#ru_green_s21" }, "up": { "uv": [ @@ -131,7 +133,7 @@ 8.0, 16 ], - "texture": "#ru_green" + "texture": "#ru_green_s12" }, "down": { "uv": [ @@ -140,7 +142,7 @@ 8.0, 16 ], - "texture": "#ru_green" + "texture": "#ru_green_s12" } } }, @@ -163,7 +165,7 @@ 1.5, 1.5 ], - "texture": "#barrel" + "texture": "#bare_barrel" }, "south": { "uv": [ @@ -172,7 +174,7 @@ 1.5, 1.5 ], - "texture": "#barrel" + "texture": "#bare_barrel" }, "east": { "uv": [ @@ -181,7 +183,7 @@ 16, 1.5 ], - "texture": "#barrel" + "texture": "#bare_barrel" }, "west": { "uv": [ @@ -190,7 +192,7 @@ 16, 1.5 ], - "texture": "#barrel" + "texture": "#bare_barrel" }, "up": { "uv": [ @@ -199,7 +201,7 @@ 1.5, 16 ], - "texture": "#barrel" + "texture": "#bare_barrel" }, "down": { "uv": [ @@ -208,7 +210,7 @@ 1.5, 16 ], - "texture": "#barrel" + "texture": "#bare_barrel" } } }, @@ -231,7 +233,7 @@ 1.5, 1.5 ], - "texture": "#barrel" + "texture": "#bare_barrel" }, "south": { "uv": [ @@ -240,7 +242,7 @@ 1.5, 1.5 ], - "texture": "#barrel" + "texture": "#bare_barrel" }, "east": { "uv": [ @@ -249,7 +251,7 @@ 16, 1.5 ], - "texture": "#barrel" + "texture": "#bare_barrel" }, "west": { "uv": [ @@ -258,7 +260,7 @@ 16, 1.5 ], - "texture": "#barrel" + "texture": "#bare_barrel" }, "up": { "uv": [ @@ -267,7 +269,7 @@ 1.5, 16 ], - "texture": "#barrel" + "texture": "#bare_barrel" }, "down": { "uv": [ @@ -276,7 +278,7 @@ 1.5, 16 ], - "texture": "#barrel" + "texture": "#bare_barrel" } } }, @@ -299,7 +301,7 @@ 1.5, 1.5 ], - "texture": "#barrel" + "texture": "#bare_barrel" }, "south": { "uv": [ @@ -308,7 +310,7 @@ 1.5, 1.5 ], - "texture": "#barrel" + "texture": "#bare_barrel" }, "east": { "uv": [ @@ -317,7 +319,7 @@ 16, 1.5 ], - "texture": "#barrel" + "texture": "#bare_barrel" }, "west": { "uv": [ @@ -326,7 +328,7 @@ 16, 1.5 ], - "texture": "#barrel" + "texture": "#bare_barrel" }, "up": { "uv": [ @@ -335,7 +337,7 @@ 1.5, 16 ], - "texture": "#barrel" + "texture": "#bare_barrel" }, "down": { "uv": [ @@ -344,7 +346,7 @@ 1.5, 16 ], - "texture": "#barrel" + "texture": "#bare_barrel" } } }, @@ -367,7 +369,7 @@ 1.5, 1.5 ], - "texture": "#barrel" + "texture": "#bare_barrel" }, "south": { "uv": [ @@ -376,7 +378,7 @@ 1.5, 1.5 ], - "texture": "#barrel" + "texture": "#bare_barrel" }, "east": { "uv": [ @@ -385,7 +387,7 @@ 16, 1.5 ], - "texture": "#barrel" + "texture": "#bare_barrel" }, "west": { "uv": [ @@ -394,7 +396,7 @@ 16, 1.5 ], - "texture": "#barrel" + "texture": "#bare_barrel" }, "up": { "uv": [ @@ -403,7 +405,7 @@ 1.5, 16 ], - "texture": "#barrel" + "texture": "#bare_barrel" }, "down": { "uv": [ @@ -412,7 +414,7 @@ 1.5, 16 ], - "texture": "#barrel" + "texture": "#bare_barrel" } } }, diff --git a/airdef-mod/assets/airdef/models/block/pantsir_pack_burnt.json b/airdef-mod/assets/airdef/models/block/pantsir_pack_burnt.json new file mode 100644 index 0000000..df62e78 --- /dev/null +++ b/airdef-mod/assets/airdef/models/block/pantsir_pack_burnt.json @@ -0,0 +1,558 @@ +{ + "ambientocclusion": false, + "textures": { + "tubes6_b": "airdef:block/tubes6_b", + "ru_green_b": "airdef:block/ru_green_b", + "ru_green_s21_b": "airdef:block/ru_green_s21_b", + "ru_green_s12_b": "airdef:block/ru_green_s12_b", + "bare_barrel_b": "airdef:block/bare_barrel_b", + "dark_metal_b": "airdef:block/dark_metal_b", + "particle": "airdef:block/tubes6_b" + }, + "elements": [ + { + "from": [ + -11.0, + 2.0, + -16.0 + ], + "to": [ + -3.0, + 12.0, + 12.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 8.0, + 10.0 + ], + "texture": "#tubes6_b" + }, + "south": { + "uv": [ + 0, + 0, + 8.0, + 10.0 + ], + "texture": "#ru_green_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 10.0 + ], + "texture": "#ru_green_s21_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 10.0 + ], + "texture": "#ru_green_s21_b" + }, + "up": { + "uv": [ + 0, + 0, + 8.0, + 16 + ], + "texture": "#ru_green_s12_b" + }, + "down": { + "uv": [ + 0, + 0, + 8.0, + 16 + ], + "texture": "#ru_green_s12_b" + } + } + }, + { + "from": [ + 19.0, + 2.0, + -16.0 + ], + "to": [ + 27.0, + 12.0, + 12.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 8.0, + 10.0 + ], + "texture": "#tubes6_b" + }, + "south": { + "uv": [ + 0, + 0, + 8.0, + 10.0 + ], + "texture": "#ru_green_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 10.0 + ], + "texture": "#ru_green_s21_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 10.0 + ], + "texture": "#ru_green_s21_b" + }, + "up": { + "uv": [ + 0, + 0, + 8.0, + 16 + ], + "texture": "#ru_green_s12_b" + }, + "down": { + "uv": [ + 0, + 0, + 8.0, + 16 + ], + "texture": "#ru_green_s12_b" + } + } + }, + { + "from": [ + -9.5, + 12.5, + -16.0 + ], + "to": [ + -8.0, + 14.0, + 6.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 1.5, + 1.5 + ], + "texture": "#bare_barrel_b" + }, + "south": { + "uv": [ + 0, + 0, + 1.5, + 1.5 + ], + "texture": "#bare_barrel_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 1.5 + ], + "texture": "#bare_barrel_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 1.5 + ], + "texture": "#bare_barrel_b" + }, + "up": { + "uv": [ + 0, + 0, + 1.5, + 16 + ], + "texture": "#bare_barrel_b" + }, + "down": { + "uv": [ + 0, + 0, + 1.5, + 16 + ], + "texture": "#bare_barrel_b" + } + } + }, + { + "from": [ + 24.0, + 12.5, + -16.0 + ], + "to": [ + 25.5, + 14.0, + 6.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 1.5, + 1.5 + ], + "texture": "#bare_barrel_b" + }, + "south": { + "uv": [ + 0, + 0, + 1.5, + 1.5 + ], + "texture": "#bare_barrel_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 1.5 + ], + "texture": "#bare_barrel_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 1.5 + ], + "texture": "#bare_barrel_b" + }, + "up": { + "uv": [ + 0, + 0, + 1.5, + 16 + ], + "texture": "#bare_barrel_b" + }, + "down": { + "uv": [ + 0, + 0, + 1.5, + 16 + ], + "texture": "#bare_barrel_b" + } + } + }, + { + "from": [ + -6.5, + 12.5, + -16.0 + ], + "to": [ + -5.0, + 14.0, + 6.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 1.5, + 1.5 + ], + "texture": "#bare_barrel_b" + }, + "south": { + "uv": [ + 0, + 0, + 1.5, + 1.5 + ], + "texture": "#bare_barrel_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 1.5 + ], + "texture": "#bare_barrel_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 1.5 + ], + "texture": "#bare_barrel_b" + }, + "up": { + "uv": [ + 0, + 0, + 1.5, + 16 + ], + "texture": "#bare_barrel_b" + }, + "down": { + "uv": [ + 0, + 0, + 1.5, + 16 + ], + "texture": "#bare_barrel_b" + } + } + }, + { + "from": [ + 21.0, + 12.5, + -16.0 + ], + "to": [ + 22.5, + 14.0, + 6.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 1.5, + 1.5 + ], + "texture": "#bare_barrel_b" + }, + "south": { + "uv": [ + 0, + 0, + 1.5, + 1.5 + ], + "texture": "#bare_barrel_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 1.5 + ], + "texture": "#bare_barrel_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 1.5 + ], + "texture": "#bare_barrel_b" + }, + "up": { + "uv": [ + 0, + 0, + 1.5, + 16 + ], + "texture": "#bare_barrel_b" + }, + "down": { + "uv": [ + 0, + 0, + 1.5, + 16 + ], + "texture": "#bare_barrel_b" + } + } + }, + { + "from": [ + -10.0, + 12.0, + 2.0 + ], + "to": [ + -4.0, + 15.0, + 10.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 6.0, + 3.0 + ], + "texture": "#dark_metal_b" + }, + "south": { + "uv": [ + 0, + 0, + 6.0, + 3.0 + ], + "texture": "#dark_metal_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.0, + 3.0 + ], + "texture": "#dark_metal_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.0, + 3.0 + ], + "texture": "#dark_metal_b" + }, + "up": { + "uv": [ + 0, + 0, + 6.0, + 8.0 + ], + "texture": "#dark_metal_b" + }, + "down": { + "uv": [ + 0, + 0, + 6.0, + 8.0 + ], + "texture": "#dark_metal_b" + } + } + }, + { + "from": [ + 20.0, + 12.0, + 2.0 + ], + "to": [ + 26.0, + 15.0, + 10.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 6.0, + 3.0 + ], + "texture": "#dark_metal_b" + }, + "south": { + "uv": [ + 0, + 0, + 6.0, + 3.0 + ], + "texture": "#dark_metal_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.0, + 3.0 + ], + "texture": "#dark_metal_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.0, + 3.0 + ], + "texture": "#dark_metal_b" + }, + "up": { + "uv": [ + 0, + 0, + 6.0, + 8.0 + ], + "texture": "#dark_metal_b" + }, + "down": { + "uv": [ + 0, + 0, + 6.0, + 8.0 + ], + "texture": "#dark_metal_b" + } + } + } + ] +} \ No newline at end of file diff --git a/airdef-mod/assets/airdef/models/block/pantsir_truck.json b/airdef-mod/assets/airdef/models/block/pantsir_truck.json index 941791c..e68a20f 100644 --- a/airdef-mod/assets/airdef/models/block/pantsir_truck.json +++ b/airdef-mod/assets/airdef/models/block/pantsir_truck.json @@ -1,11 +1,15 @@ { "ambientocclusion": false, "textures": { + "ru_green_s21": "airdef:block/ru_green_s21", + "ru_green_s31": "airdef:block/ru_green_s31", + "ru_green_s23": "airdef:block/ru_green_s23", + "glass_cab": "airdef:block/glass_cab", "ru_green": "airdef:block/ru_green", - "glass": "airdef:block/glass", "dark_metal": "airdef:block/dark_metal", "tire": "airdef:block/tire", - "particle": "airdef:block/ru_green" + "hub": "airdef:block/hub", + "particle": "airdef:block/ru_green_s21" }, "elements": [ { @@ -27,7 +31,7 @@ 16, 4.0 ], - "texture": "#ru_green" + "texture": "#ru_green_s21" }, "south": { "uv": [ @@ -36,7 +40,7 @@ 16, 4.0 ], - "texture": "#ru_green" + "texture": "#ru_green_s21" }, "east": { "uv": [ @@ -45,7 +49,7 @@ 16, 4.0 ], - "texture": "#ru_green" + "texture": "#ru_green_s31" }, "west": { "uv": [ @@ -54,7 +58,7 @@ 16, 4.0 ], - "texture": "#ru_green" + "texture": "#ru_green_s31" }, "up": { "uv": [ @@ -63,7 +67,7 @@ 16, 16 ], - "texture": "#ru_green" + "texture": "#ru_green_s23" }, "down": { "uv": [ @@ -72,7 +76,7 @@ 16, 16 ], - "texture": "#ru_green" + "texture": "#ru_green_s23" } } }, @@ -95,7 +99,7 @@ 16, 12.0 ], - "texture": "#glass" + "texture": "#glass_cab" }, "south": { "uv": [ @@ -104,7 +108,7 @@ 16, 12.0 ], - "texture": "#ru_green" + "texture": "#ru_green_s21" }, "east": { "uv": [ @@ -131,7 +135,7 @@ 16, 10.0 ], - "texture": "#ru_green" + "texture": "#ru_green_s21" }, "down": { "uv": [ @@ -140,7 +144,7 @@ 16, 10.0 ], - "texture": "#ru_green" + "texture": "#ru_green_s21" } } }, @@ -163,7 +167,7 @@ 16, 7.0 ], - "texture": "#glass" + "texture": "#glass_cab" }, "south": { "uv": [ @@ -172,7 +176,7 @@ 16, 7.0 ], - "texture": "#glass" + "texture": "#glass_cab" }, "east": { "uv": [ @@ -181,7 +185,7 @@ 0.25, 7.0 ], - "texture": "#glass" + "texture": "#glass_cab" }, "west": { "uv": [ @@ -190,7 +194,7 @@ 0.25, 7.0 ], - "texture": "#glass" + "texture": "#glass_cab" }, "up": { "uv": [ @@ -199,7 +203,7 @@ 16, 0.25 ], - "texture": "#glass" + "texture": "#glass_cab" }, "down": { "uv": [ @@ -208,7 +212,7 @@ 16, 0.25 ], - "texture": "#glass" + "texture": "#glass_cab" } } }, @@ -231,7 +235,7 @@ 16, 9.0 ], - "texture": "#ru_green" + "texture": "#ru_green_s21" }, "south": { "uv": [ @@ -240,7 +244,7 @@ 16, 9.0 ], - "texture": "#ru_green" + "texture": "#ru_green_s21" }, "east": { "uv": [ @@ -267,7 +271,7 @@ 16, 11.0 ], - "texture": "#ru_green" + "texture": "#ru_green_s21" }, "down": { "uv": [ @@ -276,7 +280,7 @@ 16, 11.0 ], - "texture": "#ru_green" + "texture": "#ru_green_s21" } } }, @@ -419,13 +423,13 @@ { "from": [ -9.0, - 0.0, - -13.0 + 0.3424499999999995, + -13.65755 ], "to": [ -5.5, - 9.0, - -6.0 + 8.65755, + -5.3424499999999995 ], "faces": { "north": { @@ -433,7 +437,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -442,7 +446,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -450,26 +454,26 @@ "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -478,7 +482,7 @@ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" } @@ -487,13 +491,13 @@ { "from": [ 21.5, - 0.0, - -13.0 + 0.3424499999999995, + -13.65755 ], "to": [ 25.0, - 9.0, - -6.0 + 8.65755, + -5.3424499999999995 ], "faces": { "north": { @@ -501,7 +505,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -510,7 +514,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -518,26 +522,26 @@ "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -546,22 +550,176 @@ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" } } }, + { + "from": [ + -8.97, + 0.3424499999999995, + -13.65755 + ], + "to": [ + -5.53, + 8.65755, + -5.3424499999999995 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -7.25, + 4.5, + -9.5 + ] + } + }, + { + "from": [ + 21.53, + 0.3424499999999995, + -13.65755 + ], + "to": [ + 24.97, + 8.65755, + -5.3424499999999995 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 23.25, + 4.5, + -9.5 + ] + } + }, { "from": [ -9.0, - 0.0, - -4.0 + 0.3424499999999995, + -4.6575500000000005 ], "to": [ -5.5, - 9.0, - 3.0 + 8.65755, + 3.6575500000000005 ], "faces": { "north": { @@ -569,7 +727,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -578,7 +736,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -586,26 +744,26 @@ "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -614,7 +772,7 @@ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" } @@ -623,13 +781,13 @@ { "from": [ 21.5, - 0.0, - -4.0 + 0.3424499999999995, + -4.6575500000000005 ], "to": [ 25.0, - 9.0, - 3.0 + 8.65755, + 3.6575500000000005 ], "faces": { "north": { @@ -637,7 +795,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -646,7 +804,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -654,26 +812,26 @@ "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -682,22 +840,176 @@ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" } } }, + { + "from": [ + -8.97, + 0.3424499999999995, + -4.6575500000000005 + ], + "to": [ + -5.53, + 8.65755, + 3.6575500000000005 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -7.25, + 4.5, + -0.5 + ] + } + }, + { + "from": [ + 21.53, + 0.3424499999999995, + -4.6575500000000005 + ], + "to": [ + 24.97, + 8.65755, + 3.6575500000000005 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 23.25, + 4.5, + -0.5 + ] + } + }, { "from": [ -9.0, - 0.0, - 16.0 + 0.3424499999999995, + 15.34245 ], "to": [ -5.5, - 9.0, - 23.0 + 8.65755, + 23.65755 ], "faces": { "north": { @@ -705,7 +1017,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -714,7 +1026,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -722,26 +1034,26 @@ "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -750,7 +1062,7 @@ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" } @@ -759,13 +1071,13 @@ { "from": [ 21.5, - 0.0, - 16.0 + 0.3424499999999995, + 15.34245 ], "to": [ 25.0, - 9.0, - 23.0 + 8.65755, + 23.65755 ], "faces": { "north": { @@ -773,7 +1085,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -782,7 +1094,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -790,26 +1102,26 @@ "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -818,22 +1130,176 @@ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" } } }, + { + "from": [ + -8.97, + 0.3424499999999995, + 15.34245 + ], + "to": [ + -5.53, + 8.65755, + 23.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -7.25, + 4.5, + 19.5 + ] + } + }, + { + "from": [ + 21.53, + 0.3424499999999995, + 15.34245 + ], + "to": [ + 24.97, + 8.65755, + 23.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 23.25, + 4.5, + 19.5 + ] + } + }, { "from": [ -9.0, - 0.0, - 24.0 + 0.3424499999999995, + 23.34245 ], "to": [ -5.5, - 9.0, - 31.0 + 8.65755, + 31.65755 ], "faces": { "north": { @@ -841,7 +1307,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -850,7 +1316,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -858,26 +1324,26 @@ "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -886,7 +1352,7 @@ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" } @@ -895,13 +1361,13 @@ { "from": [ 21.5, - 0.0, - 24.0 + 0.3424499999999995, + 23.34245 ], "to": [ 25.0, - 9.0, - 31.0 + 8.65755, + 31.65755 ], "faces": { "north": { @@ -909,7 +1375,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -918,7 +1384,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -926,26 +1392,26 @@ "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -954,11 +1420,165 @@ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" } } + }, + { + "from": [ + -8.97, + 0.3424499999999995, + 23.34245 + ], + "to": [ + -5.53, + 8.65755, + 31.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -7.25, + 4.5, + 27.5 + ] + } + }, + { + "from": [ + 21.53, + 0.3424499999999995, + 23.34245 + ], + "to": [ + 24.97, + 8.65755, + 31.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 23.25, + 4.5, + 27.5 + ] + } } ] } \ No newline at end of file diff --git a/airdef-mod/assets/airdef/models/block/pantsir_truck_burnt.json b/airdef-mod/assets/airdef/models/block/pantsir_truck_burnt.json new file mode 100644 index 0000000..53e470e --- /dev/null +++ b/airdef-mod/assets/airdef/models/block/pantsir_truck_burnt.json @@ -0,0 +1,1584 @@ +{ + "ambientocclusion": false, + "textures": { + "ru_green_s21_b": "airdef:block/ru_green_s21_b", + "ru_green_s31_b": "airdef:block/ru_green_s31_b", + "ru_green_s23_b": "airdef:block/ru_green_s23_b", + "glass_cab_b": "airdef:block/glass_cab_b", + "ru_green_b": "airdef:block/ru_green_b", + "dark_metal_b": "airdef:block/dark_metal_b", + "tire_b": "airdef:block/tire_b", + "hub_b": "airdef:block/hub_b", + "particle": "airdef:block/ru_green_s21_b" + }, + "elements": [ + { + "from": [ + -6.0, + 5.0, + -16.0 + ], + "to": [ + 22.0, + 9.0, + 32.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#ru_green_s21_b" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#ru_green_s21_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#ru_green_s31_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#ru_green_s31_b" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#ru_green_s23_b" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#ru_green_s23_b" + } + } + }, + { + "from": [ + -6.0, + 9.0, + -16.0 + ], + "to": [ + 22.0, + 21.0, + -6.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 12.0 + ], + "texture": "#glass_cab_b" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 12.0 + ], + "texture": "#ru_green_s21_b" + }, + "east": { + "uv": [ + 0, + 0, + 10.0, + 12.0 + ], + "texture": "#ru_green_b" + }, + "west": { + "uv": [ + 0, + 0, + 10.0, + 12.0 + ], + "texture": "#ru_green_b" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 10.0 + ], + "texture": "#ru_green_s21_b" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 10.0 + ], + "texture": "#ru_green_s21_b" + } + } + }, + { + "from": [ + -5.0, + 13.0, + -16.0 + ], + "to": [ + 21.0, + 20.0, + -15.9 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 7.0 + ], + "texture": "#glass_cab_b" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 7.0 + ], + "texture": "#glass_cab_b" + }, + "east": { + "uv": [ + 0, + 0, + 0.25, + 7.0 + ], + "texture": "#glass_cab_b" + }, + "west": { + "uv": [ + 0, + 0, + 0.25, + 7.0 + ], + "texture": "#glass_cab_b" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 0.25 + ], + "texture": "#glass_cab_b" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 0.25 + ], + "texture": "#glass_cab_b" + } + } + }, + { + "from": [ + -5.0, + 9.0, + -5.0 + ], + "to": [ + 21.0, + 18.0, + 6.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 9.0 + ], + "texture": "#ru_green_s21_b" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 9.0 + ], + "texture": "#ru_green_s21_b" + }, + "east": { + "uv": [ + 0, + 0, + 11.0, + 9.0 + ], + "texture": "#ru_green_b" + }, + "west": { + "uv": [ + 0, + 0, + 11.0, + 9.0 + ], + "texture": "#ru_green_b" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 11.0 + ], + "texture": "#ru_green_s21_b" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 11.0 + ], + "texture": "#ru_green_s21_b" + } + } + }, + { + "from": [ + -4.0, + 9.0, + 8.0 + ], + "to": [ + 20.0, + 12.0, + 30.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 3.0 + ], + "texture": "#dark_metal_b" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 3.0 + ], + "texture": "#dark_metal_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 3.0 + ], + "texture": "#dark_metal_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 3.0 + ], + "texture": "#dark_metal_b" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#dark_metal_b" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#dark_metal_b" + } + } + }, + { + "from": [ + -6.5, + 3.0, + 26.0 + ], + "to": [ + 22.5, + 6.0, + 32.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 3.0 + ], + "texture": "#dark_metal_b" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 3.0 + ], + "texture": "#dark_metal_b" + }, + "east": { + "uv": [ + 0, + 0, + 6.0, + 3.0 + ], + "texture": "#dark_metal_b" + }, + "west": { + "uv": [ + 0, + 0, + 6.0, + 3.0 + ], + "texture": "#dark_metal_b" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 6.0 + ], + "texture": "#dark_metal_b" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 6.0 + ], + "texture": "#dark_metal_b" + } + } + }, + { + "from": [ + -9.0, + 0.3424499999999995, + -13.65755 + ], + "to": [ + -5.5, + 8.65755, + -5.3424499999999995 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + } + } + }, + { + "from": [ + 21.5, + 0.3424499999999995, + -13.65755 + ], + "to": [ + 25.0, + 8.65755, + -5.3424499999999995 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + } + } + }, + { + "from": [ + -8.97, + 0.3424499999999995, + -13.65755 + ], + "to": [ + -5.53, + 8.65755, + -5.3424499999999995 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -7.25, + 4.5, + -9.5 + ] + } + }, + { + "from": [ + 21.53, + 0.3424499999999995, + -13.65755 + ], + "to": [ + 24.97, + 8.65755, + -5.3424499999999995 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 23.25, + 4.5, + -9.5 + ] + } + }, + { + "from": [ + -9.0, + 0.3424499999999995, + -4.6575500000000005 + ], + "to": [ + -5.5, + 8.65755, + 3.6575500000000005 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + } + } + }, + { + "from": [ + 21.5, + 0.3424499999999995, + -4.6575500000000005 + ], + "to": [ + 25.0, + 8.65755, + 3.6575500000000005 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + } + } + }, + { + "from": [ + -8.97, + 0.3424499999999995, + -4.6575500000000005 + ], + "to": [ + -5.53, + 8.65755, + 3.6575500000000005 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -7.25, + 4.5, + -0.5 + ] + } + }, + { + "from": [ + 21.53, + 0.3424499999999995, + -4.6575500000000005 + ], + "to": [ + 24.97, + 8.65755, + 3.6575500000000005 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 23.25, + 4.5, + -0.5 + ] + } + }, + { + "from": [ + -9.0, + 0.3424499999999995, + 15.34245 + ], + "to": [ + -5.5, + 8.65755, + 23.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + } + } + }, + { + "from": [ + 21.5, + 0.3424499999999995, + 15.34245 + ], + "to": [ + 25.0, + 8.65755, + 23.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + } + } + }, + { + "from": [ + -8.97, + 0.3424499999999995, + 15.34245 + ], + "to": [ + -5.53, + 8.65755, + 23.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -7.25, + 4.5, + 19.5 + ] + } + }, + { + "from": [ + 21.53, + 0.3424499999999995, + 15.34245 + ], + "to": [ + 24.97, + 8.65755, + 23.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 23.25, + 4.5, + 19.5 + ] + } + }, + { + "from": [ + -9.0, + 0.3424499999999995, + 23.34245 + ], + "to": [ + -5.5, + 8.65755, + 31.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + } + } + }, + { + "from": [ + 21.5, + 0.3424499999999995, + 23.34245 + ], + "to": [ + 25.0, + 8.65755, + 31.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + } + } + }, + { + "from": [ + -8.97, + 0.3424499999999995, + 23.34245 + ], + "to": [ + -5.53, + 8.65755, + 31.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -7.25, + 4.5, + 27.5 + ] + } + }, + { + "from": [ + 21.53, + 0.3424499999999995, + 23.34245 + ], + "to": [ + 24.97, + 8.65755, + 31.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 23.25, + 4.5, + 27.5 + ] + } + } + ] +} \ No newline at end of file diff --git a/airdef-mod/assets/airdef/models/block/pantsir_turret_burnt.json b/airdef-mod/assets/airdef/models/block/pantsir_turret_burnt.json new file mode 100644 index 0000000..e0c51b3 --- /dev/null +++ b/airdef-mod/assets/airdef/models/block/pantsir_turret_burnt.json @@ -0,0 +1,283 @@ +{ + "ambientocclusion": false, + "textures": { + "ru_green_b": "airdef:block/ru_green_b", + "radar_face_b": "airdef:block/radar_face_b", + "metal_b": "airdef:block/metal_b", + "particle": "airdef:block/ru_green_b" + }, + "elements": [ + { + "from": [ + -2.0, + 0.0, + -6.0 + ], + "to": [ + 18.0, + 10.0, + 16.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 10.0 + ], + "texture": "#ru_green_b" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 10.0 + ], + "texture": "#ru_green_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 10.0 + ], + "texture": "#ru_green_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 10.0 + ], + "texture": "#ru_green_b" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#ru_green_b" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#ru_green_b" + } + } + }, + { + "from": [ + 1.0, + 1.0, + -11.0 + ], + "to": [ + 15.0, + 11.0, + -6.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 14.0, + 10.0 + ], + "texture": "#radar_face_b" + }, + "south": { + "uv": [ + 0, + 0, + 14.0, + 10.0 + ], + "texture": "#radar_face_b" + }, + "east": { + "uv": [ + 0, + 0, + 5.0, + 10.0 + ], + "texture": "#radar_face_b" + }, + "west": { + "uv": [ + 0, + 0, + 5.0, + 10.0 + ], + "texture": "#radar_face_b" + }, + "up": { + "uv": [ + 0, + 0, + 14.0, + 5.0 + ], + "texture": "#radar_face_b" + }, + "down": { + "uv": [ + 0, + 0, + 14.0, + 5.0 + ], + "texture": "#radar_face_b" + } + } + }, + { + "from": [ + 7.0, + 10.0, + 4.0 + ], + "to": [ + 9.0, + 17.0, + 6.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 2.0, + 7.0 + ], + "texture": "#metal_b" + }, + "south": { + "uv": [ + 0, + 0, + 2.0, + 7.0 + ], + "texture": "#metal_b" + }, + "east": { + "uv": [ + 0, + 0, + 2.0, + 7.0 + ], + "texture": "#metal_b" + }, + "west": { + "uv": [ + 0, + 0, + 2.0, + 7.0 + ], + "texture": "#metal_b" + }, + "up": { + "uv": [ + 0, + 0, + 2.0, + 2.0 + ], + "texture": "#metal_b" + }, + "down": { + "uv": [ + 0, + 0, + 2.0, + 2.0 + ], + "texture": "#metal_b" + } + } + }, + { + "from": [ + 0.0, + 10.0, + 8.0 + ], + "to": [ + 16.0, + 12.0, + 16.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 2.0 + ], + "texture": "#ru_green_b" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 2.0 + ], + "texture": "#ru_green_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.0, + 2.0 + ], + "texture": "#ru_green_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.0, + 2.0 + ], + "texture": "#ru_green_b" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 8.0 + ], + "texture": "#ru_green_b" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 8.0 + ], + "texture": "#ru_green_b" + } + } + } + ] +} \ No newline at end of file diff --git a/airdef-mod/assets/airdef/models/block/patriot_launcher.json b/airdef-mod/assets/airdef/models/block/patriot_launcher.json index bee8164..913f925 100644 --- a/airdef-mod/assets/airdef/models/block/patriot_launcher.json +++ b/airdef-mod/assets/airdef/models/block/patriot_launcher.json @@ -1,11 +1,11 @@ { "ambientocclusion": false, "textures": { - "canister": "airdef:block/canister", "canister_front": "airdef:block/canister_front", + "canister": "airdef:block/canister", "dark_metal": "airdef:block/dark_metal", "metal": "airdef:block/metal", - "particle": "airdef:block/canister" + "particle": "airdef:block/canister_front" }, "elements": [ { diff --git a/airdef-mod/assets/airdef/models/block/patriot_launcher_burnt.json b/airdef-mod/assets/airdef/models/block/patriot_launcher_burnt.json new file mode 100644 index 0000000..b917458 --- /dev/null +++ b/airdef-mod/assets/airdef/models/block/patriot_launcher_burnt.json @@ -0,0 +1,556 @@ +{ + "ambientocclusion": false, + "textures": { + "canister_front_b": "airdef:block/canister_front_b", + "canister_b": "airdef:block/canister_b", + "dark_metal_b": "airdef:block/dark_metal_b", + "metal_b": "airdef:block/metal_b", + "particle": "airdef:block/canister_front_b" + }, + "elements": [ + { + "from": [ + -6.0, + 1.0, + -14.0 + ], + "to": [ + 22.0, + 19.0, + 30.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#canister_front_b" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#canister_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#canister_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#canister_b" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#canister_b" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#canister_b" + } + } + }, + { + "from": [ + -6.5, + 9.5, + -14.0 + ], + "to": [ + 22.5, + 10.5, + 30.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 1.0 + ], + "texture": "#dark_metal_b" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 1.0 + ], + "texture": "#dark_metal_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 1.0 + ], + "texture": "#dark_metal_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 1.0 + ], + "texture": "#dark_metal_b" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#dark_metal_b" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#dark_metal_b" + } + } + }, + { + "from": [ + 7.5, + 1.0, + -14.0 + ], + "to": [ + 8.5, + 19.0, + 30.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 1.0, + 16 + ], + "texture": "#dark_metal_b" + }, + "south": { + "uv": [ + 0, + 0, + 1.0, + 16 + ], + "texture": "#dark_metal_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#dark_metal_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#dark_metal_b" + }, + "up": { + "uv": [ + 0, + 0, + 1.0, + 16 + ], + "texture": "#dark_metal_b" + }, + "down": { + "uv": [ + 0, + 0, + 1.0, + 16 + ], + "texture": "#dark_metal_b" + } + } + }, + { + "from": [ + -7.0, + 0.0, + 24.0 + ], + "to": [ + 23.0, + 2.0, + 30.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 2.0 + ], + "texture": "#metal_b" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 2.0 + ], + "texture": "#metal_b" + }, + "east": { + "uv": [ + 0, + 0, + 6.0, + 2.0 + ], + "texture": "#metal_b" + }, + "west": { + "uv": [ + 0, + 0, + 6.0, + 2.0 + ], + "texture": "#metal_b" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 6.0 + ], + "texture": "#metal_b" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 6.0 + ], + "texture": "#metal_b" + } + } + }, + { + "from": [ + -8.0, + 2.0, + -10.0 + ], + "to": [ + -6.0, + 17.0, + -6.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 2.0, + 15.0 + ], + "texture": "#metal_b" + }, + "south": { + "uv": [ + 0, + 0, + 2.0, + 15.0 + ], + "texture": "#metal_b" + }, + "east": { + "uv": [ + 0, + 0, + 4.0, + 15.0 + ], + "texture": "#metal_b" + }, + "west": { + "uv": [ + 0, + 0, + 4.0, + 15.0 + ], + "texture": "#metal_b" + }, + "up": { + "uv": [ + 0, + 0, + 2.0, + 4.0 + ], + "texture": "#metal_b" + }, + "down": { + "uv": [ + 0, + 0, + 2.0, + 4.0 + ], + "texture": "#metal_b" + } + } + }, + { + "from": [ + 22.0, + 2.0, + -10.0 + ], + "to": [ + 24.0, + 17.0, + -6.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 2.0, + 15.0 + ], + "texture": "#metal_b" + }, + "south": { + "uv": [ + 0, + 0, + 2.0, + 15.0 + ], + "texture": "#metal_b" + }, + "east": { + "uv": [ + 0, + 0, + 4.0, + 15.0 + ], + "texture": "#metal_b" + }, + "west": { + "uv": [ + 0, + 0, + 4.0, + 15.0 + ], + "texture": "#metal_b" + }, + "up": { + "uv": [ + 0, + 0, + 2.0, + 4.0 + ], + "texture": "#metal_b" + }, + "down": { + "uv": [ + 0, + 0, + 2.0, + 4.0 + ], + "texture": "#metal_b" + } + } + }, + { + "from": [ + -8.0, + 2.0, + 20.0 + ], + "to": [ + -6.0, + 17.0, + 24.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 2.0, + 15.0 + ], + "texture": "#metal_b" + }, + "south": { + "uv": [ + 0, + 0, + 2.0, + 15.0 + ], + "texture": "#metal_b" + }, + "east": { + "uv": [ + 0, + 0, + 4.0, + 15.0 + ], + "texture": "#metal_b" + }, + "west": { + "uv": [ + 0, + 0, + 4.0, + 15.0 + ], + "texture": "#metal_b" + }, + "up": { + "uv": [ + 0, + 0, + 2.0, + 4.0 + ], + "texture": "#metal_b" + }, + "down": { + "uv": [ + 0, + 0, + 2.0, + 4.0 + ], + "texture": "#metal_b" + } + } + }, + { + "from": [ + 22.0, + 2.0, + 20.0 + ], + "to": [ + 24.0, + 17.0, + 24.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 2.0, + 15.0 + ], + "texture": "#metal_b" + }, + "south": { + "uv": [ + 0, + 0, + 2.0, + 15.0 + ], + "texture": "#metal_b" + }, + "east": { + "uv": [ + 0, + 0, + 4.0, + 15.0 + ], + "texture": "#metal_b" + }, + "west": { + "uv": [ + 0, + 0, + 4.0, + 15.0 + ], + "texture": "#metal_b" + }, + "up": { + "uv": [ + 0, + 0, + 2.0, + 4.0 + ], + "texture": "#metal_b" + }, + "down": { + "uv": [ + 0, + 0, + 2.0, + 4.0 + ], + "texture": "#metal_b" + } + } + } + ] +} \ No newline at end of file diff --git a/airdef-mod/assets/airdef/models/block/patriot_radar.json b/airdef-mod/assets/airdef/models/block/patriot_radar.json index 262252f..69278c2 100644 --- a/airdef-mod/assets/airdef/models/block/patriot_radar.json +++ b/airdef-mod/assets/airdef/models/block/patriot_radar.json @@ -1,11 +1,14 @@ { "ambientocclusion": false, "textures": { + "nato_green_s21": "airdef:block/nato_green_s21", + "nato_green_s22": "airdef:block/nato_green_s22", "nato_green": "airdef:block/nato_green", "radar_face": "airdef:block/radar_face", "metal": "airdef:block/metal", "tire": "airdef:block/tire", - "particle": "airdef:block/nato_green" + "hub": "airdef:block/hub", + "particle": "airdef:block/nato_green_s21" }, "elements": [ { @@ -27,7 +30,7 @@ 16, 4.0 ], - "texture": "#nato_green" + "texture": "#nato_green_s21" }, "south": { "uv": [ @@ -36,7 +39,7 @@ 16, 4.0 ], - "texture": "#nato_green" + "texture": "#nato_green_s21" }, "east": { "uv": [ @@ -45,7 +48,7 @@ 16, 4.0 ], - "texture": "#nato_green" + "texture": "#nato_green_s21" }, "west": { "uv": [ @@ -54,7 +57,7 @@ 16, 4.0 ], - "texture": "#nato_green" + "texture": "#nato_green_s21" }, "up": { "uv": [ @@ -63,7 +66,7 @@ 16, 16 ], - "texture": "#nato_green" + "texture": "#nato_green_s22" }, "down": { "uv": [ @@ -72,7 +75,7 @@ 16, 16 ], - "texture": "#nato_green" + "texture": "#nato_green_s22" } } }, @@ -95,7 +98,7 @@ 16, 16 ], - "texture": "#nato_green" + "texture": "#nato_green_s21" }, "south": { "uv": [ @@ -104,7 +107,7 @@ 16, 16 ], - "texture": "#nato_green" + "texture": "#nato_green_s21" }, "east": { "uv": [ @@ -131,7 +134,7 @@ 16, 14.0 ], - "texture": "#nato_green" + "texture": "#nato_green_s21" }, "down": { "uv": [ @@ -140,7 +143,7 @@ 16, 14.0 ], - "texture": "#nato_green" + "texture": "#nato_green_s21" } } }, @@ -283,13 +286,13 @@ { "from": [ -9.0, - 0.0, - 14.0 + 0.35006000000000004, + 13.750060000000001 ], "to": [ -5.5, - 9.0, - 22.0 + 8.84994, + 22.24994 ], "faces": { "north": { @@ -297,7 +300,7 @@ 0, 0, 3.5, - 9.0 + 8.499880000000001 ], "texture": "#tire" }, @@ -306,7 +309,7 @@ 0, 0, 3.5, - 9.0 + 8.499880000000001 ], "texture": "#tire" }, @@ -314,26 +317,26 @@ "uv": [ 0, 0, - 8.0, - 9.0 + 8.499879999999997, + 8.499880000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 8.0, - 9.0 + 8.499879999999997, + 8.499880000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 8.0 + 8.499879999999997 ], "texture": "#tire" }, @@ -342,7 +345,7 @@ 0, 0, 3.5, - 8.0 + 8.499879999999997 ], "texture": "#tire" } @@ -351,13 +354,13 @@ { "from": [ 21.5, - 0.0, - 14.0 + 0.35006000000000004, + 13.750060000000001 ], "to": [ 25.0, - 9.0, - 22.0 + 8.84994, + 22.24994 ], "faces": { "north": { @@ -365,7 +368,7 @@ 0, 0, 3.5, - 9.0 + 8.499880000000001 ], "texture": "#tire" }, @@ -374,7 +377,7 @@ 0, 0, 3.5, - 9.0 + 8.499880000000001 ], "texture": "#tire" }, @@ -382,26 +385,26 @@ "uv": [ 0, 0, - 8.0, - 9.0 + 8.499879999999997, + 8.499880000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 8.0, - 9.0 + 8.499879999999997, + 8.499880000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 8.0 + 8.499879999999997 ], "texture": "#tire" }, @@ -410,11 +413,165 @@ 0, 0, 3.5, - 8.0 + 8.499879999999997 ], "texture": "#tire" } } + }, + { + "from": [ + -8.97, + 0.35006000000000004, + 13.750060000000001 + ], + "to": [ + -5.53, + 8.84994, + 22.24994 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.499880000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.499880000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.499879999999997, + 8.499880000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.499879999999997, + 8.499880000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.499879999999997 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.499879999999997 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -7.25, + 4.6, + 18.0 + ] + } + }, + { + "from": [ + 21.53, + 0.35006000000000004, + 13.750060000000001 + ], + "to": [ + 24.97, + 8.84994, + 22.24994 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.499880000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.499880000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.499879999999997, + 8.499880000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.499879999999997, + 8.499880000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.499879999999997 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.499879999999997 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 23.25, + 4.6, + 18.0 + ] + } } ] } \ No newline at end of file diff --git a/airdef-mod/assets/airdef/models/block/patriot_trailer.json b/airdef-mod/assets/airdef/models/block/patriot_trailer.json index d92a5bc..7260bce 100644 --- a/airdef-mod/assets/airdef/models/block/patriot_trailer.json +++ b/airdef-mod/assets/airdef/models/block/patriot_trailer.json @@ -1,11 +1,14 @@ { "ambientocclusion": false, "textures": { - "nato_green": "airdef:block/nato_green", + "nato_green_s21": "airdef:block/nato_green_s21", + "nato_green_s31": "airdef:block/nato_green_s31", + "nato_green_s23": "airdef:block/nato_green_s23", "metal": "airdef:block/metal", "dark_metal": "airdef:block/dark_metal", "tire": "airdef:block/tire", - "particle": "airdef:block/nato_green" + "hub": "airdef:block/hub", + "particle": "airdef:block/nato_green_s21" }, "elements": [ { @@ -27,7 +30,7 @@ 16, 5.0 ], - "texture": "#nato_green" + "texture": "#nato_green_s21" }, "south": { "uv": [ @@ -36,7 +39,7 @@ 16, 5.0 ], - "texture": "#nato_green" + "texture": "#nato_green_s21" }, "east": { "uv": [ @@ -45,7 +48,7 @@ 16, 5.0 ], - "texture": "#nato_green" + "texture": "#nato_green_s31" }, "west": { "uv": [ @@ -54,7 +57,7 @@ 16, 5.0 ], - "texture": "#nato_green" + "texture": "#nato_green_s31" }, "up": { "uv": [ @@ -63,7 +66,7 @@ 16, 16 ], - "texture": "#nato_green" + "texture": "#nato_green_s23" }, "down": { "uv": [ @@ -72,7 +75,7 @@ 16, 16 ], - "texture": "#nato_green" + "texture": "#nato_green_s23" } } }, @@ -215,13 +218,13 @@ { "from": [ -10.0, - 0.0, - 14.0 + 0.35006000000000004, + 13.750060000000001 ], "to": [ -6.5, - 9.0, - 22.0 + 8.84994, + 22.24994 ], "faces": { "north": { @@ -229,7 +232,7 @@ 0, 0, 3.5, - 9.0 + 8.499880000000001 ], "texture": "#tire" }, @@ -238,7 +241,7 @@ 0, 0, 3.5, - 9.0 + 8.499880000000001 ], "texture": "#tire" }, @@ -246,26 +249,26 @@ "uv": [ 0, 0, - 8.0, - 9.0 + 8.499879999999997, + 8.499880000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 8.0, - 9.0 + 8.499879999999997, + 8.499880000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 8.0 + 8.499879999999997 ], "texture": "#tire" }, @@ -274,7 +277,7 @@ 0, 0, 3.5, - 8.0 + 8.499879999999997 ], "texture": "#tire" } @@ -283,13 +286,13 @@ { "from": [ 22.5, - 0.0, - 14.0 + 0.35006000000000004, + 13.750060000000001 ], "to": [ 26.0, - 9.0, - 22.0 + 8.84994, + 22.24994 ], "faces": { "north": { @@ -297,7 +300,7 @@ 0, 0, 3.5, - 9.0 + 8.499880000000001 ], "texture": "#tire" }, @@ -306,7 +309,7 @@ 0, 0, 3.5, - 9.0 + 8.499880000000001 ], "texture": "#tire" }, @@ -314,26 +317,26 @@ "uv": [ 0, 0, - 8.0, - 9.0 + 8.499879999999997, + 8.499880000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 8.0, - 9.0 + 8.499879999999997, + 8.499880000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 8.0 + 8.499879999999997 ], "texture": "#tire" }, @@ -342,22 +345,176 @@ 0, 0, 3.5, - 8.0 + 8.499879999999997 ], "texture": "#tire" } } }, + { + "from": [ + -9.97, + 0.35006000000000004, + 13.750060000000001 + ], + "to": [ + -6.53, + 8.84994, + 22.24994 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.499880000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.499880000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.499879999999997, + 8.499880000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.499879999999997, + 8.499880000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.499879999999997 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.499879999999997 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -8.25, + 4.6, + 18.0 + ] + } + }, + { + "from": [ + 22.53, + 0.35006000000000004, + 13.750060000000001 + ], + "to": [ + 25.97, + 8.84994, + 22.24994 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.499880000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.499880000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.499879999999997, + 8.499880000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.499879999999997, + 8.499880000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.499879999999997 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.499879999999997 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 24.25, + 4.6, + 18.0 + ] + } + }, { "from": [ -10.0, - 0.0, - 23.0 + 0.35006000000000004, + 22.75006 ], "to": [ -6.5, - 9.0, - 31.0 + 8.84994, + 31.24994 ], "faces": { "north": { @@ -365,7 +522,7 @@ 0, 0, 3.5, - 9.0 + 8.499880000000001 ], "texture": "#tire" }, @@ -374,7 +531,7 @@ 0, 0, 3.5, - 9.0 + 8.499880000000001 ], "texture": "#tire" }, @@ -382,26 +539,26 @@ "uv": [ 0, 0, - 8.0, - 9.0 + 8.499879999999997, + 8.499880000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 8.0, - 9.0 + 8.499879999999997, + 8.499880000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 8.0 + 8.499879999999997 ], "texture": "#tire" }, @@ -410,7 +567,7 @@ 0, 0, 3.5, - 8.0 + 8.499879999999997 ], "texture": "#tire" } @@ -419,13 +576,13 @@ { "from": [ 22.5, - 0.0, - 23.0 + 0.35006000000000004, + 22.75006 ], "to": [ 26.0, - 9.0, - 31.0 + 8.84994, + 31.24994 ], "faces": { "north": { @@ -433,7 +590,7 @@ 0, 0, 3.5, - 9.0 + 8.499880000000001 ], "texture": "#tire" }, @@ -442,7 +599,7 @@ 0, 0, 3.5, - 9.0 + 8.499880000000001 ], "texture": "#tire" }, @@ -450,26 +607,26 @@ "uv": [ 0, 0, - 8.0, - 9.0 + 8.499879999999997, + 8.499880000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 8.0, - 9.0 + 8.499879999999997, + 8.499880000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 8.0 + 8.499879999999997 ], "texture": "#tire" }, @@ -478,12 +635,166 @@ 0, 0, 3.5, - 8.0 + 8.499879999999997 ], "texture": "#tire" } } }, + { + "from": [ + -9.97, + 0.35006000000000004, + 22.75006 + ], + "to": [ + -6.53, + 8.84994, + 31.24994 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.499880000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.499880000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.499879999999997, + 8.499880000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.499879999999997, + 8.499880000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.499879999999997 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.499879999999997 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -8.25, + 4.6, + 27.0 + ] + } + }, + { + "from": [ + 22.53, + 0.35006000000000004, + 22.75006 + ], + "to": [ + 25.97, + 8.84994, + 31.24994 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.499880000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.499880000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.499879999999997, + 8.499880000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.499879999999997, + 8.499880000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.499879999999997 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.499879999999997 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 24.25, + 4.6, + 27.0 + ] + } + }, { "from": [ -9.0, diff --git a/airdef-mod/assets/airdef/models/block/patriot_trailer_burnt.json b/airdef-mod/assets/airdef/models/block/patriot_trailer_burnt.json new file mode 100644 index 0000000..2b9d852 --- /dev/null +++ b/airdef-mod/assets/airdef/models/block/patriot_trailer_burnt.json @@ -0,0 +1,867 @@ +{ + "ambientocclusion": false, + "textures": { + "nato_green_s21_b": "airdef:block/nato_green_s21_b", + "nato_green_s31_b": "airdef:block/nato_green_s31_b", + "nato_green_s23_b": "airdef:block/nato_green_s23_b", + "metal_b": "airdef:block/metal_b", + "dark_metal_b": "airdef:block/dark_metal_b", + "tire_b": "airdef:block/tire_b", + "hub_b": "airdef:block/hub_b", + "particle": "airdef:block/nato_green_s21_b" + }, + "elements": [ + { + "from": [ + -7.0, + 6.0, + -16.0 + ], + "to": [ + 23.0, + 11.0, + 32.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 5.0 + ], + "texture": "#nato_green_s21_b" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 5.0 + ], + "texture": "#nato_green_s21_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 5.0 + ], + "texture": "#nato_green_s31_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 5.0 + ], + "texture": "#nato_green_s31_b" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#nato_green_s23_b" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#nato_green_s23_b" + } + } + }, + { + "from": [ + -1.0, + 11.0, + 14.0 + ], + "to": [ + 17.0, + 16.0, + 30.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 5.0 + ], + "texture": "#metal_b" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 5.0 + ], + "texture": "#metal_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 5.0 + ], + "texture": "#metal_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 5.0 + ], + "texture": "#metal_b" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#metal_b" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#metal_b" + } + } + }, + { + "from": [ + -8.0, + 3.0, + -16.0 + ], + "to": [ + 24.0, + 7.0, + -12.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#dark_metal_b" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#dark_metal_b" + }, + "east": { + "uv": [ + 0, + 0, + 4.0, + 4.0 + ], + "texture": "#dark_metal_b" + }, + "west": { + "uv": [ + 0, + 0, + 4.0, + 4.0 + ], + "texture": "#dark_metal_b" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#dark_metal_b" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#dark_metal_b" + } + } + }, + { + "from": [ + -10.0, + 0.35006000000000004, + 13.750060000000001 + ], + "to": [ + -6.5, + 8.84994, + 22.24994 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.5, + 8.499880000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.5, + 8.499880000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.499879999999997, + 8.499880000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.499879999999997, + 8.499880000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.5, + 8.499879999999997 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.5, + 8.499879999999997 + ], + "texture": "#tire_b" + } + } + }, + { + "from": [ + 22.5, + 0.35006000000000004, + 13.750060000000001 + ], + "to": [ + 26.0, + 8.84994, + 22.24994 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.5, + 8.499880000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.5, + 8.499880000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.499879999999997, + 8.499880000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.499879999999997, + 8.499880000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.5, + 8.499879999999997 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.5, + 8.499879999999997 + ], + "texture": "#tire_b" + } + } + }, + { + "from": [ + -9.97, + 0.35006000000000004, + 13.750060000000001 + ], + "to": [ + -6.53, + 8.84994, + 22.24994 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.499880000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.499880000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.499879999999997, + 8.499880000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.499879999999997, + 8.499880000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.499879999999997 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.499879999999997 + ], + "texture": "#tire_b" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -8.25, + 4.6, + 18.0 + ] + } + }, + { + "from": [ + 22.53, + 0.35006000000000004, + 13.750060000000001 + ], + "to": [ + 25.97, + 8.84994, + 22.24994 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.499880000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.499880000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.499879999999997, + 8.499880000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.499879999999997, + 8.499880000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.499879999999997 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.499879999999997 + ], + "texture": "#tire_b" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 24.25, + 4.6, + 18.0 + ] + } + }, + { + "from": [ + -10.0, + 0.35006000000000004, + 22.75006 + ], + "to": [ + -6.5, + 8.84994, + 31.24994 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.5, + 8.499880000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.5, + 8.499880000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.499879999999997, + 8.499880000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.499879999999997, + 8.499880000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.5, + 8.499879999999997 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.5, + 8.499879999999997 + ], + "texture": "#tire_b" + } + } + }, + { + "from": [ + 22.5, + 0.35006000000000004, + 22.75006 + ], + "to": [ + 26.0, + 8.84994, + 31.24994 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.5, + 8.499880000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.5, + 8.499880000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.499879999999997, + 8.499880000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.499879999999997, + 8.499880000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.5, + 8.499879999999997 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.5, + 8.499879999999997 + ], + "texture": "#tire_b" + } + } + }, + { + "from": [ + -9.97, + 0.35006000000000004, + 22.75006 + ], + "to": [ + -6.53, + 8.84994, + 31.24994 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.499880000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.499880000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.499879999999997, + 8.499880000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.499879999999997, + 8.499880000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.499879999999997 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.499879999999997 + ], + "texture": "#tire_b" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -8.25, + 4.6, + 27.0 + ] + } + }, + { + "from": [ + 22.53, + 0.35006000000000004, + 22.75006 + ], + "to": [ + 25.97, + 8.84994, + 31.24994 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.499880000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.499880000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.499879999999997, + 8.499880000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.499879999999997, + 8.499880000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.499879999999997 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.499879999999997 + ], + "texture": "#tire_b" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 24.25, + 4.6, + 27.0 + ] + } + }, + { + "from": [ + -9.0, + 0.0, + -6.0 + ], + "to": [ + -7.0, + 6.0, + -4.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 2.0, + 6.0 + ], + "texture": "#metal_b" + }, + "south": { + "uv": [ + 0, + 0, + 2.0, + 6.0 + ], + "texture": "#metal_b" + }, + "east": { + "uv": [ + 0, + 0, + 2.0, + 6.0 + ], + "texture": "#metal_b" + }, + "west": { + "uv": [ + 0, + 0, + 2.0, + 6.0 + ], + "texture": "#metal_b" + }, + "up": { + "uv": [ + 0, + 0, + 2.0, + 2.0 + ], + "texture": "#metal_b" + }, + "down": { + "uv": [ + 0, + 0, + 2.0, + 2.0 + ], + "texture": "#metal_b" + } + } + } + ] +} \ No newline at end of file diff --git a/airdef-mod/assets/airdef/models/block/patriot_truck.json b/airdef-mod/assets/airdef/models/block/patriot_truck.json index 842c12b..b547e5b 100644 --- a/airdef-mod/assets/airdef/models/block/patriot_truck.json +++ b/airdef-mod/assets/airdef/models/block/patriot_truck.json @@ -1,12 +1,16 @@ { "ambientocclusion": false, "textures": { + "nato_green_s21": "airdef:block/nato_green_s21", + "nato_green_s31": "airdef:block/nato_green_s31", + "nato_green_s23": "airdef:block/nato_green_s23", "nato_green": "airdef:block/nato_green", - "glass": "airdef:block/glass", + "glass_cab": "airdef:block/glass_cab", "dark_metal": "airdef:block/dark_metal", "metal": "airdef:block/metal", "tire": "airdef:block/tire", - "particle": "airdef:block/nato_green" + "hub": "airdef:block/hub", + "particle": "airdef:block/nato_green_s21" }, "elements": [ { @@ -28,7 +32,7 @@ 16, 4.0 ], - "texture": "#nato_green" + "texture": "#nato_green_s21" }, "south": { "uv": [ @@ -37,7 +41,7 @@ 16, 4.0 ], - "texture": "#nato_green" + "texture": "#nato_green_s21" }, "east": { "uv": [ @@ -46,7 +50,7 @@ 16, 4.0 ], - "texture": "#nato_green" + "texture": "#nato_green_s31" }, "west": { "uv": [ @@ -55,7 +59,7 @@ 16, 4.0 ], - "texture": "#nato_green" + "texture": "#nato_green_s31" }, "up": { "uv": [ @@ -64,7 +68,7 @@ 16, 16 ], - "texture": "#nato_green" + "texture": "#nato_green_s23" }, "down": { "uv": [ @@ -73,7 +77,7 @@ 16, 16 ], - "texture": "#nato_green" + "texture": "#nato_green_s23" } } }, @@ -96,7 +100,7 @@ 16, 15.0 ], - "texture": "#nato_green" + "texture": "#nato_green_s21" }, "south": { "uv": [ @@ -105,7 +109,7 @@ 16, 15.0 ], - "texture": "#nato_green" + "texture": "#nato_green_s21" }, "east": { "uv": [ @@ -132,7 +136,7 @@ 16, 14.0 ], - "texture": "#nato_green" + "texture": "#nato_green_s21" }, "down": { "uv": [ @@ -141,7 +145,7 @@ 16, 14.0 ], - "texture": "#nato_green" + "texture": "#nato_green_s21" } } }, @@ -164,7 +168,7 @@ 16, 7.0 ], - "texture": "#glass" + "texture": "#glass_cab" }, "south": { "uv": [ @@ -173,7 +177,7 @@ 16, 7.0 ], - "texture": "#glass" + "texture": "#glass_cab" }, "east": { "uv": [ @@ -182,7 +186,7 @@ 1.0, 7.0 ], - "texture": "#glass" + "texture": "#glass_cab" }, "west": { "uv": [ @@ -191,7 +195,7 @@ 1.0, 7.0 ], - "texture": "#glass" + "texture": "#glass_cab" }, "up": { "uv": [ @@ -200,7 +204,7 @@ 16, 1.0 ], - "texture": "#glass" + "texture": "#glass_cab" }, "down": { "uv": [ @@ -209,7 +213,7 @@ 16, 1.0 ], - "texture": "#glass" + "texture": "#glass_cab" } } }, @@ -232,7 +236,7 @@ 0.25, 7.0 ], - "texture": "#glass" + "texture": "#glass_cab" }, "south": { "uv": [ @@ -241,7 +245,7 @@ 0.25, 7.0 ], - "texture": "#glass" + "texture": "#glass_cab" }, "east": { "uv": [ @@ -250,7 +254,7 @@ 9.0, 7.0 ], - "texture": "#glass" + "texture": "#glass_cab" }, "west": { "uv": [ @@ -259,7 +263,7 @@ 9.0, 7.0 ], - "texture": "#glass" + "texture": "#glass_cab" }, "up": { "uv": [ @@ -268,7 +272,7 @@ 0.25, 9.0 ], - "texture": "#glass" + "texture": "#glass_cab" }, "down": { "uv": [ @@ -277,7 +281,7 @@ 0.25, 9.0 ], - "texture": "#glass" + "texture": "#glass_cab" } } }, @@ -300,7 +304,7 @@ 0.25, 7.0 ], - "texture": "#glass" + "texture": "#glass_cab" }, "south": { "uv": [ @@ -309,7 +313,7 @@ 0.25, 7.0 ], - "texture": "#glass" + "texture": "#glass_cab" }, "east": { "uv": [ @@ -318,7 +322,7 @@ 9.0, 7.0 ], - "texture": "#glass" + "texture": "#glass_cab" }, "west": { "uv": [ @@ -327,7 +331,7 @@ 9.0, 7.0 ], - "texture": "#glass" + "texture": "#glass_cab" }, "up": { "uv": [ @@ -336,7 +340,7 @@ 0.25, 9.0 ], - "texture": "#glass" + "texture": "#glass_cab" }, "down": { "uv": [ @@ -345,7 +349,7 @@ 0.25, 9.0 ], - "texture": "#glass" + "texture": "#glass_cab" } } }, @@ -368,7 +372,7 @@ 16, 6.0 ], - "texture": "#nato_green" + "texture": "#nato_green_s21" }, "south": { "uv": [ @@ -377,7 +381,7 @@ 16, 6.0 ], - "texture": "#nato_green" + "texture": "#nato_green_s21" }, "east": { "uv": [ @@ -404,7 +408,7 @@ 16, 14.0 ], - "texture": "#nato_green" + "texture": "#nato_green_s21" }, "down": { "uv": [ @@ -413,7 +417,7 @@ 16, 14.0 ], - "texture": "#nato_green" + "texture": "#nato_green_s21" } } }, @@ -556,13 +560,13 @@ { "from": [ -9.0, - 0.0, - -12.0 + 0.35006000000000004, + -12.249939999999999 ], "to": [ -5.5, - 9.0, - -4.0 + 8.84994, + -3.7500600000000004 ], "faces": { "north": { @@ -570,7 +574,7 @@ 0, 0, 3.5, - 9.0 + 8.499880000000001 ], "texture": "#tire" }, @@ -579,7 +583,7 @@ 0, 0, 3.5, - 9.0 + 8.499880000000001 ], "texture": "#tire" }, @@ -587,26 +591,26 @@ "uv": [ 0, 0, - 8.0, - 9.0 + 8.499879999999997, + 8.499880000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 8.0, - 9.0 + 8.499879999999997, + 8.499880000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 8.0 + 8.499879999999997 ], "texture": "#tire" }, @@ -615,7 +619,7 @@ 0, 0, 3.5, - 8.0 + 8.499879999999997 ], "texture": "#tire" } @@ -624,13 +628,13 @@ { "from": [ 21.5, - 0.0, - -12.0 + 0.35006000000000004, + -12.249939999999999 ], "to": [ 25.0, - 9.0, - -4.0 + 8.84994, + -3.7500600000000004 ], "faces": { "north": { @@ -638,7 +642,7 @@ 0, 0, 3.5, - 9.0 + 8.499880000000001 ], "texture": "#tire" }, @@ -647,7 +651,7 @@ 0, 0, 3.5, - 9.0 + 8.499880000000001 ], "texture": "#tire" }, @@ -655,26 +659,26 @@ "uv": [ 0, 0, - 8.0, - 9.0 + 8.499879999999997, + 8.499880000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 8.0, - 9.0 + 8.499879999999997, + 8.499880000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 8.0 + 8.499879999999997 ], "texture": "#tire" }, @@ -683,22 +687,176 @@ 0, 0, 3.5, - 8.0 + 8.499879999999997 ], "texture": "#tire" } } }, + { + "from": [ + -8.97, + 0.35006000000000004, + -12.249939999999999 + ], + "to": [ + -5.53, + 8.84994, + -3.7500600000000004 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.499880000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.499880000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.499879999999997, + 8.499880000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.499879999999997, + 8.499880000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.499879999999997 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.499879999999997 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -7.25, + 4.6, + -8.0 + ] + } + }, + { + "from": [ + 21.53, + 0.35006000000000004, + -12.249939999999999 + ], + "to": [ + 24.97, + 8.84994, + -3.7500600000000004 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.499880000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.499880000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.499879999999997, + 8.499880000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.499879999999997, + 8.499880000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.499879999999997 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.499879999999997 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 23.25, + 4.6, + -8.0 + ] + } + }, { "from": [ -9.0, - 0.0, - 14.0 + 0.35006000000000004, + 13.750060000000001 ], "to": [ -5.5, - 9.0, - 22.0 + 8.84994, + 22.24994 ], "faces": { "north": { @@ -706,7 +864,7 @@ 0, 0, 3.5, - 9.0 + 8.499880000000001 ], "texture": "#tire" }, @@ -715,7 +873,7 @@ 0, 0, 3.5, - 9.0 + 8.499880000000001 ], "texture": "#tire" }, @@ -723,26 +881,26 @@ "uv": [ 0, 0, - 8.0, - 9.0 + 8.499879999999997, + 8.499880000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 8.0, - 9.0 + 8.499879999999997, + 8.499880000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 8.0 + 8.499879999999997 ], "texture": "#tire" }, @@ -751,7 +909,7 @@ 0, 0, 3.5, - 8.0 + 8.499879999999997 ], "texture": "#tire" } @@ -760,13 +918,13 @@ { "from": [ 21.5, - 0.0, - 14.0 + 0.35006000000000004, + 13.750060000000001 ], "to": [ 25.0, - 9.0, - 22.0 + 8.84994, + 22.24994 ], "faces": { "north": { @@ -774,7 +932,7 @@ 0, 0, 3.5, - 9.0 + 8.499880000000001 ], "texture": "#tire" }, @@ -783,7 +941,7 @@ 0, 0, 3.5, - 9.0 + 8.499880000000001 ], "texture": "#tire" }, @@ -791,26 +949,26 @@ "uv": [ 0, 0, - 8.0, - 9.0 + 8.499879999999997, + 8.499880000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 8.0, - 9.0 + 8.499879999999997, + 8.499880000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 8.0 + 8.499879999999997 ], "texture": "#tire" }, @@ -819,22 +977,176 @@ 0, 0, 3.5, - 8.0 + 8.499879999999997 ], "texture": "#tire" } } }, + { + "from": [ + -8.97, + 0.35006000000000004, + 13.750060000000001 + ], + "to": [ + -5.53, + 8.84994, + 22.24994 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.499880000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.499880000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.499879999999997, + 8.499880000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.499879999999997, + 8.499880000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.499879999999997 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.499879999999997 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -7.25, + 4.6, + 18.0 + ] + } + }, + { + "from": [ + 21.53, + 0.35006000000000004, + 13.750060000000001 + ], + "to": [ + 24.97, + 8.84994, + 22.24994 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.499880000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.499880000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.499879999999997, + 8.499880000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.499879999999997, + 8.499880000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.499879999999997 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.499879999999997 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 23.25, + 4.6, + 18.0 + ] + } + }, { "from": [ -9.0, - 0.0, - 23.0 + 0.35006000000000004, + 22.75006 ], "to": [ -5.5, - 9.0, - 31.0 + 8.84994, + 31.24994 ], "faces": { "north": { @@ -842,7 +1154,7 @@ 0, 0, 3.5, - 9.0 + 8.499880000000001 ], "texture": "#tire" }, @@ -851,7 +1163,7 @@ 0, 0, 3.5, - 9.0 + 8.499880000000001 ], "texture": "#tire" }, @@ -859,26 +1171,26 @@ "uv": [ 0, 0, - 8.0, - 9.0 + 8.499879999999997, + 8.499880000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 8.0, - 9.0 + 8.499879999999997, + 8.499880000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 8.0 + 8.499879999999997 ], "texture": "#tire" }, @@ -887,7 +1199,7 @@ 0, 0, 3.5, - 8.0 + 8.499879999999997 ], "texture": "#tire" } @@ -896,13 +1208,13 @@ { "from": [ 21.5, - 0.0, - 23.0 + 0.35006000000000004, + 22.75006 ], "to": [ 25.0, - 9.0, - 31.0 + 8.84994, + 31.24994 ], "faces": { "north": { @@ -910,7 +1222,7 @@ 0, 0, 3.5, - 9.0 + 8.499880000000001 ], "texture": "#tire" }, @@ -919,7 +1231,7 @@ 0, 0, 3.5, - 9.0 + 8.499880000000001 ], "texture": "#tire" }, @@ -927,26 +1239,26 @@ "uv": [ 0, 0, - 8.0, - 9.0 + 8.499879999999997, + 8.499880000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 8.0, - 9.0 + 8.499879999999997, + 8.499880000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 8.0 + 8.499879999999997 ], "texture": "#tire" }, @@ -955,11 +1267,165 @@ 0, 0, 3.5, - 8.0 + 8.499879999999997 ], "texture": "#tire" } } + }, + { + "from": [ + -8.97, + 0.35006000000000004, + 22.75006 + ], + "to": [ + -5.53, + 8.84994, + 31.24994 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.499880000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.499880000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.499879999999997, + 8.499880000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.499879999999997, + 8.499880000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.499879999999997 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.499879999999997 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -7.25, + 4.6, + 27.0 + ] + } + }, + { + "from": [ + 21.53, + 0.35006000000000004, + 22.75006 + ], + "to": [ + 24.97, + 8.84994, + 31.24994 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.499880000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.499880000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.499879999999997, + 8.499880000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.499879999999997, + 8.499880000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.499879999999997 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.499879999999997 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 23.25, + 4.6, + 27.0 + ] + } } ] } \ No newline at end of file diff --git a/airdef-mod/assets/airdef/models/block/radar_trailer.json b/airdef-mod/assets/airdef/models/block/radar_trailer.json index a4ee3f6..926e353 100644 --- a/airdef-mod/assets/airdef/models/block/radar_trailer.json +++ b/airdef-mod/assets/airdef/models/block/radar_trailer.json @@ -1,10 +1,13 @@ { "ambientocclusion": false, "textures": { - "ru_khaki": "airdef:block/ru_khaki", + "ru_khaki_s21": "airdef:block/ru_khaki_s21", + "ru_khaki_s22": "airdef:block/ru_khaki_s22", "dark_metal": "airdef:block/dark_metal", + "ru_khaki": "airdef:block/ru_khaki", "tire": "airdef:block/tire", - "particle": "airdef:block/ru_khaki" + "hub": "airdef:block/hub", + "particle": "airdef:block/ru_khaki_s21" }, "elements": [ { @@ -26,7 +29,7 @@ 16, 5.0 ], - "texture": "#ru_khaki" + "texture": "#ru_khaki_s21" }, "south": { "uv": [ @@ -35,7 +38,7 @@ 16, 5.0 ], - "texture": "#ru_khaki" + "texture": "#ru_khaki_s21" }, "east": { "uv": [ @@ -44,7 +47,7 @@ 16, 5.0 ], - "texture": "#ru_khaki" + "texture": "#ru_khaki_s21" }, "west": { "uv": [ @@ -53,7 +56,7 @@ 16, 5.0 ], - "texture": "#ru_khaki" + "texture": "#ru_khaki_s21" }, "up": { "uv": [ @@ -62,7 +65,7 @@ 16, 16 ], - "texture": "#ru_khaki" + "texture": "#ru_khaki_s22" }, "down": { "uv": [ @@ -71,7 +74,7 @@ 16, 16 ], - "texture": "#ru_khaki" + "texture": "#ru_khaki_s22" } } }, @@ -162,7 +165,7 @@ 16, 8.0 ], - "texture": "#ru_khaki" + "texture": "#ru_khaki_s21" }, "south": { "uv": [ @@ -171,7 +174,7 @@ 16, 8.0 ], - "texture": "#ru_khaki" + "texture": "#ru_khaki_s21" }, "east": { "uv": [ @@ -198,7 +201,7 @@ 16, 10.0 ], - "texture": "#ru_khaki" + "texture": "#ru_khaki_s21" }, "down": { "uv": [ @@ -207,20 +210,20 @@ 16, 10.0 ], - "texture": "#ru_khaki" + "texture": "#ru_khaki_s21" } } }, { "from": [ -9.0, - 0.0, - -9.0 + 0.3424499999999995, + -9.65755 ], "to": [ -5.5, - 9.0, - -2.0 + 8.65755, + -1.3424499999999995 ], "faces": { "north": { @@ -228,7 +231,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -237,7 +240,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -245,26 +248,26 @@ "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -273,7 +276,7 @@ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" } @@ -282,13 +285,13 @@ { "from": [ 21.5, - 0.0, - -9.0 + 0.3424499999999995, + -9.65755 ], "to": [ 25.0, - 9.0, - -2.0 + 8.65755, + -1.3424499999999995 ], "faces": { "north": { @@ -296,7 +299,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -305,7 +308,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -313,26 +316,26 @@ "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -341,22 +344,176 @@ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" } } }, + { + "from": [ + -8.97, + 0.3424499999999995, + -9.65755 + ], + "to": [ + -5.53, + 8.65755, + -1.3424499999999995 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -7.25, + 4.5, + -5.5 + ] + } + }, + { + "from": [ + 21.53, + 0.3424499999999995, + -9.65755 + ], + "to": [ + 24.97, + 8.65755, + -1.3424499999999995 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 23.25, + 4.5, + -5.5 + ] + } + }, { "from": [ -9.0, - 0.0, - 17.0 + 0.3424499999999995, + 16.34245 ], "to": [ -5.5, - 9.0, - 24.0 + 8.65755, + 24.65755 ], "faces": { "north": { @@ -364,7 +521,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -373,7 +530,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -381,26 +538,26 @@ "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -409,7 +566,7 @@ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" } @@ -418,13 +575,13 @@ { "from": [ 21.5, - 0.0, - 17.0 + 0.3424499999999995, + 16.34245 ], "to": [ 25.0, - 9.0, - 24.0 + 8.65755, + 24.65755 ], "faces": { "north": { @@ -432,7 +589,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -441,7 +598,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -449,26 +606,26 @@ "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -477,11 +634,165 @@ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" } } + }, + { + "from": [ + -8.97, + 0.3424499999999995, + 16.34245 + ], + "to": [ + -5.53, + 8.65755, + 24.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -7.25, + 4.5, + 20.5 + ] + } + }, + { + "from": [ + 21.53, + 0.3424499999999995, + 16.34245 + ], + "to": [ + 24.97, + 8.65755, + 24.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 23.25, + 4.5, + 20.5 + ] + } } ] } \ No newline at end of file diff --git a/airdef-mod/assets/airdef/models/block/radar_truck.json b/airdef-mod/assets/airdef/models/block/radar_truck.json index be4f125..7e763a3 100644 --- a/airdef-mod/assets/airdef/models/block/radar_truck.json +++ b/airdef-mod/assets/airdef/models/block/radar_truck.json @@ -1,12 +1,16 @@ { "ambientocclusion": false, "textures": { + "ru_khaki_s21": "airdef:block/ru_khaki_s21", + "ru_khaki_s31": "airdef:block/ru_khaki_s31", + "ru_khaki_s23": "airdef:block/ru_khaki_s23", + "glass_cab": "airdef:block/glass_cab", "ru_khaki": "airdef:block/ru_khaki", - "glass": "airdef:block/glass", "dark_metal": "airdef:block/dark_metal", "metal": "airdef:block/metal", "tire": "airdef:block/tire", - "particle": "airdef:block/ru_khaki" + "hub": "airdef:block/hub", + "particle": "airdef:block/ru_khaki_s21" }, "elements": [ { @@ -28,7 +32,7 @@ 16, 5.0 ], - "texture": "#ru_khaki" + "texture": "#ru_khaki_s21" }, "south": { "uv": [ @@ -37,7 +41,7 @@ 16, 5.0 ], - "texture": "#ru_khaki" + "texture": "#ru_khaki_s21" }, "east": { "uv": [ @@ -46,7 +50,7 @@ 16, 5.0 ], - "texture": "#ru_khaki" + "texture": "#ru_khaki_s31" }, "west": { "uv": [ @@ -55,7 +59,7 @@ 16, 5.0 ], - "texture": "#ru_khaki" + "texture": "#ru_khaki_s31" }, "up": { "uv": [ @@ -64,7 +68,7 @@ 16, 16 ], - "texture": "#ru_khaki" + "texture": "#ru_khaki_s23" }, "down": { "uv": [ @@ -73,7 +77,7 @@ 16, 16 ], - "texture": "#ru_khaki" + "texture": "#ru_khaki_s23" } } }, @@ -96,7 +100,7 @@ 9.0, 9.0 ], - "texture": "#glass" + "texture": "#glass_cab" }, "south": { "uv": [ @@ -164,7 +168,7 @@ 9.0, 9.0 ], - "texture": "#glass" + "texture": "#glass_cab" }, "south": { "uv": [ @@ -300,7 +304,7 @@ 16, 3.0 ], - "texture": "#ru_khaki" + "texture": "#ru_khaki_s21" }, "south": { "uv": [ @@ -309,7 +313,7 @@ 16, 3.0 ], - "texture": "#ru_khaki" + "texture": "#ru_khaki_s21" }, "east": { "uv": [ @@ -336,7 +340,7 @@ 16, 10.0 ], - "texture": "#ru_khaki" + "texture": "#ru_khaki_s21" }, "down": { "uv": [ @@ -345,7 +349,7 @@ 16, 10.0 ], - "texture": "#ru_khaki" + "texture": "#ru_khaki_s21" } } }, @@ -556,13 +560,13 @@ { "from": [ -9.0, - 0.0, - -14.0 + 0.3424499999999995, + -14.65755 ], "to": [ -5.5, - 9.0, - -7.0 + 8.65755, + -6.3424499999999995 ], "faces": { "north": { @@ -570,7 +574,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -579,7 +583,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -587,26 +591,26 @@ "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -615,7 +619,7 @@ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" } @@ -624,13 +628,13 @@ { "from": [ 21.5, - 0.0, - -14.0 + 0.3424499999999995, + -14.65755 ], "to": [ 25.0, - 9.0, - -7.0 + 8.65755, + -6.3424499999999995 ], "faces": { "north": { @@ -638,7 +642,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -647,7 +651,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -655,26 +659,26 @@ "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -683,22 +687,176 @@ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" } } }, + { + "from": [ + -8.97, + 0.3424499999999995, + -14.65755 + ], + "to": [ + -5.53, + 8.65755, + -6.3424499999999995 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -7.25, + 4.5, + -10.5 + ] + } + }, + { + "from": [ + 21.53, + 0.3424499999999995, + -14.65755 + ], + "to": [ + 24.97, + 8.65755, + -6.3424499999999995 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 23.25, + 4.5, + -10.5 + ] + } + }, { "from": [ -9.0, - 0.0, - -5.0 + 0.3424499999999995, + -5.6575500000000005 ], "to": [ -5.5, - 9.0, - 2.0 + 8.65755, + 2.6575500000000005 ], "faces": { "north": { @@ -706,7 +864,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -715,7 +873,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -723,26 +881,26 @@ "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -751,7 +909,7 @@ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" } @@ -760,13 +918,13 @@ { "from": [ 21.5, - 0.0, - -5.0 + 0.3424499999999995, + -5.6575500000000005 ], "to": [ 25.0, - 9.0, - 2.0 + 8.65755, + 2.6575500000000005 ], "faces": { "north": { @@ -774,7 +932,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -783,7 +941,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -791,26 +949,26 @@ "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -819,22 +977,176 @@ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" } } }, + { + "from": [ + -8.97, + 0.3424499999999995, + -5.6575500000000005 + ], + "to": [ + -5.53, + 8.65755, + 2.6575500000000005 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -7.25, + 4.5, + -1.5 + ] + } + }, + { + "from": [ + 21.53, + 0.3424499999999995, + -5.6575500000000005 + ], + "to": [ + 24.97, + 8.65755, + 2.6575500000000005 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 23.25, + 4.5, + -1.5 + ] + } + }, { "from": [ -9.0, - 0.0, - 13.0 + 0.3424499999999995, + 12.34245 ], "to": [ -5.5, - 9.0, - 20.0 + 8.65755, + 20.65755 ], "faces": { "north": { @@ -842,7 +1154,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -851,7 +1163,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -859,26 +1171,26 @@ "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -887,7 +1199,7 @@ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" } @@ -896,13 +1208,13 @@ { "from": [ 21.5, - 0.0, - 13.0 + 0.3424499999999995, + 12.34245 ], "to": [ 25.0, - 9.0, - 20.0 + 8.65755, + 20.65755 ], "faces": { "north": { @@ -910,7 +1222,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -919,7 +1231,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -927,26 +1239,26 @@ "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -955,22 +1267,176 @@ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" } } }, + { + "from": [ + -8.97, + 0.3424499999999995, + 12.34245 + ], + "to": [ + -5.53, + 8.65755, + 20.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -7.25, + 4.5, + 16.5 + ] + } + }, + { + "from": [ + 21.53, + 0.3424499999999995, + 12.34245 + ], + "to": [ + 24.97, + 8.65755, + 20.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 23.25, + 4.5, + 16.5 + ] + } + }, { "from": [ -9.0, - 0.0, - 22.0 + 0.3424499999999995, + 21.34245 ], "to": [ -5.5, - 9.0, - 29.0 + 8.65755, + 29.65755 ], "faces": { "north": { @@ -978,7 +1444,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -987,7 +1453,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -995,26 +1461,26 @@ "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -1023,7 +1489,7 @@ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" } @@ -1032,13 +1498,13 @@ { "from": [ 21.5, - 0.0, - 22.0 + 0.3424499999999995, + 21.34245 ], "to": [ 25.0, - 9.0, - 29.0 + 8.65755, + 29.65755 ], "faces": { "north": { @@ -1046,7 +1512,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -1055,7 +1521,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -1063,26 +1529,26 @@ "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -1091,11 +1557,165 @@ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" } } + }, + { + "from": [ + -8.97, + 0.3424499999999995, + 21.34245 + ], + "to": [ + -5.53, + 8.65755, + 29.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -7.25, + 4.5, + 25.5 + ] + } + }, + { + "from": [ + 21.53, + 0.3424499999999995, + 21.34245 + ], + "to": [ + 24.97, + 8.65755, + 29.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 23.25, + 4.5, + 25.5 + ] + } } ] } \ No newline at end of file diff --git a/airdef-mod/assets/airdef/models/block/radar_truck_burnt.json b/airdef-mod/assets/airdef/models/block/radar_truck_burnt.json new file mode 100644 index 0000000..646f18f --- /dev/null +++ b/airdef-mod/assets/airdef/models/block/radar_truck_burnt.json @@ -0,0 +1,1721 @@ +{ + "ambientocclusion": false, + "textures": { + "ru_khaki_s21_b": "airdef:block/ru_khaki_s21_b", + "ru_khaki_s31_b": "airdef:block/ru_khaki_s31_b", + "ru_khaki_s23_b": "airdef:block/ru_khaki_s23_b", + "glass_cab_b": "airdef:block/glass_cab_b", + "ru_khaki_b": "airdef:block/ru_khaki_b", + "dark_metal_b": "airdef:block/dark_metal_b", + "metal_b": "airdef:block/metal_b", + "tire_b": "airdef:block/tire_b", + "hub_b": "airdef:block/hub_b", + "particle": "airdef:block/ru_khaki_s21_b" + }, + "elements": [ + { + "from": [ + -6.0, + 5.0, + -16.0 + ], + "to": [ + 22.0, + 10.0, + 32.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 5.0 + ], + "texture": "#ru_khaki_s21_b" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 5.0 + ], + "texture": "#ru_khaki_s21_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 5.0 + ], + "texture": "#ru_khaki_s31_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 5.0 + ], + "texture": "#ru_khaki_s31_b" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#ru_khaki_s23_b" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#ru_khaki_s23_b" + } + } + }, + { + "from": [ + -6.0, + 10.0, + -16.0 + ], + "to": [ + 3.0, + 19.0, + -7.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 9.0, + 9.0 + ], + "texture": "#glass_cab_b" + }, + "south": { + "uv": [ + 0, + 0, + 9.0, + 9.0 + ], + "texture": "#ru_khaki_b" + }, + "east": { + "uv": [ + 0, + 0, + 9.0, + 9.0 + ], + "texture": "#ru_khaki_b" + }, + "west": { + "uv": [ + 0, + 0, + 9.0, + 9.0 + ], + "texture": "#ru_khaki_b" + }, + "up": { + "uv": [ + 0, + 0, + 9.0, + 9.0 + ], + "texture": "#ru_khaki_b" + }, + "down": { + "uv": [ + 0, + 0, + 9.0, + 9.0 + ], + "texture": "#ru_khaki_b" + } + } + }, + { + "from": [ + 13.0, + 10.0, + -16.0 + ], + "to": [ + 22.0, + 19.0, + -7.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 9.0, + 9.0 + ], + "texture": "#glass_cab_b" + }, + "south": { + "uv": [ + 0, + 0, + 9.0, + 9.0 + ], + "texture": "#ru_khaki_b" + }, + "east": { + "uv": [ + 0, + 0, + 9.0, + 9.0 + ], + "texture": "#ru_khaki_b" + }, + "west": { + "uv": [ + 0, + 0, + 9.0, + 9.0 + ], + "texture": "#ru_khaki_b" + }, + "up": { + "uv": [ + 0, + 0, + 9.0, + 9.0 + ], + "texture": "#ru_khaki_b" + }, + "down": { + "uv": [ + 0, + 0, + 9.0, + 9.0 + ], + "texture": "#ru_khaki_b" + } + } + }, + { + "from": [ + 3.0, + 10.0, + -16.0 + ], + "to": [ + 13.0, + 15.0, + -6.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 10.0, + 5.0 + ], + "texture": "#dark_metal_b" + }, + "south": { + "uv": [ + 0, + 0, + 10.0, + 5.0 + ], + "texture": "#dark_metal_b" + }, + "east": { + "uv": [ + 0, + 0, + 10.0, + 5.0 + ], + "texture": "#dark_metal_b" + }, + "west": { + "uv": [ + 0, + 0, + 10.0, + 5.0 + ], + "texture": "#dark_metal_b" + }, + "up": { + "uv": [ + 0, + 0, + 10.0, + 10.0 + ], + "texture": "#dark_metal_b" + }, + "down": { + "uv": [ + 0, + 0, + 10.0, + 10.0 + ], + "texture": "#dark_metal_b" + } + } + }, + { + "from": [ + -5.0, + 10.0, + -6.0 + ], + "to": [ + 21.0, + 13.0, + 4.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 3.0 + ], + "texture": "#ru_khaki_s21_b" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 3.0 + ], + "texture": "#ru_khaki_s21_b" + }, + "east": { + "uv": [ + 0, + 0, + 10.0, + 3.0 + ], + "texture": "#ru_khaki_b" + }, + "west": { + "uv": [ + 0, + 0, + 10.0, + 3.0 + ], + "texture": "#ru_khaki_b" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 10.0 + ], + "texture": "#ru_khaki_s21_b" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 10.0 + ], + "texture": "#ru_khaki_s21_b" + } + } + }, + { + "from": [ + -3.0, + 10.0, + 26.0 + ], + "to": [ + 19.0, + 14.0, + 32.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#dark_metal_b" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#dark_metal_b" + }, + "east": { + "uv": [ + 0, + 0, + 6.0, + 4.0 + ], + "texture": "#dark_metal_b" + }, + "west": { + "uv": [ + 0, + 0, + 6.0, + 4.0 + ], + "texture": "#dark_metal_b" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 6.0 + ], + "texture": "#dark_metal_b" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 6.0 + ], + "texture": "#dark_metal_b" + } + } + }, + { + "from": [ + -8.0, + 0.0, + 28.0 + ], + "to": [ + -6.0, + 6.0, + 31.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 2.0, + 6.0 + ], + "texture": "#metal_b" + }, + "south": { + "uv": [ + 0, + 0, + 2.0, + 6.0 + ], + "texture": "#metal_b" + }, + "east": { + "uv": [ + 0, + 0, + 3.0, + 6.0 + ], + "texture": "#metal_b" + }, + "west": { + "uv": [ + 0, + 0, + 3.0, + 6.0 + ], + "texture": "#metal_b" + }, + "up": { + "uv": [ + 0, + 0, + 2.0, + 3.0 + ], + "texture": "#metal_b" + }, + "down": { + "uv": [ + 0, + 0, + 2.0, + 3.0 + ], + "texture": "#metal_b" + } + } + }, + { + "from": [ + 22.0, + 0.0, + 28.0 + ], + "to": [ + 24.0, + 6.0, + 31.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 2.0, + 6.0 + ], + "texture": "#metal_b" + }, + "south": { + "uv": [ + 0, + 0, + 2.0, + 6.0 + ], + "texture": "#metal_b" + }, + "east": { + "uv": [ + 0, + 0, + 3.0, + 6.0 + ], + "texture": "#metal_b" + }, + "west": { + "uv": [ + 0, + 0, + 3.0, + 6.0 + ], + "texture": "#metal_b" + }, + "up": { + "uv": [ + 0, + 0, + 2.0, + 3.0 + ], + "texture": "#metal_b" + }, + "down": { + "uv": [ + 0, + 0, + 2.0, + 3.0 + ], + "texture": "#metal_b" + } + } + }, + { + "from": [ + -9.0, + 0.3424499999999995, + -14.65755 + ], + "to": [ + -5.5, + 8.65755, + -6.3424499999999995 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + } + } + }, + { + "from": [ + 21.5, + 0.3424499999999995, + -14.65755 + ], + "to": [ + 25.0, + 8.65755, + -6.3424499999999995 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + } + } + }, + { + "from": [ + -8.97, + 0.3424499999999995, + -14.65755 + ], + "to": [ + -5.53, + 8.65755, + -6.3424499999999995 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -7.25, + 4.5, + -10.5 + ] + } + }, + { + "from": [ + 21.53, + 0.3424499999999995, + -14.65755 + ], + "to": [ + 24.97, + 8.65755, + -6.3424499999999995 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 23.25, + 4.5, + -10.5 + ] + } + }, + { + "from": [ + -9.0, + 0.3424499999999995, + -5.6575500000000005 + ], + "to": [ + -5.5, + 8.65755, + 2.6575500000000005 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + } + } + }, + { + "from": [ + 21.5, + 0.3424499999999995, + -5.6575500000000005 + ], + "to": [ + 25.0, + 8.65755, + 2.6575500000000005 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + } + } + }, + { + "from": [ + -8.97, + 0.3424499999999995, + -5.6575500000000005 + ], + "to": [ + -5.53, + 8.65755, + 2.6575500000000005 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -7.25, + 4.5, + -1.5 + ] + } + }, + { + "from": [ + 21.53, + 0.3424499999999995, + -5.6575500000000005 + ], + "to": [ + 24.97, + 8.65755, + 2.6575500000000005 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 23.25, + 4.5, + -1.5 + ] + } + }, + { + "from": [ + -9.0, + 0.3424499999999995, + 12.34245 + ], + "to": [ + -5.5, + 8.65755, + 20.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + } + } + }, + { + "from": [ + 21.5, + 0.3424499999999995, + 12.34245 + ], + "to": [ + 25.0, + 8.65755, + 20.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + } + } + }, + { + "from": [ + -8.97, + 0.3424499999999995, + 12.34245 + ], + "to": [ + -5.53, + 8.65755, + 20.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -7.25, + 4.5, + 16.5 + ] + } + }, + { + "from": [ + 21.53, + 0.3424499999999995, + 12.34245 + ], + "to": [ + 24.97, + 8.65755, + 20.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 23.25, + 4.5, + 16.5 + ] + } + }, + { + "from": [ + -9.0, + 0.3424499999999995, + 21.34245 + ], + "to": [ + -5.5, + 8.65755, + 29.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + } + } + }, + { + "from": [ + 21.5, + 0.3424499999999995, + 21.34245 + ], + "to": [ + 25.0, + 8.65755, + 29.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + } + } + }, + { + "from": [ + -8.97, + 0.3424499999999995, + 21.34245 + ], + "to": [ + -5.53, + 8.65755, + 29.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -7.25, + 4.5, + 25.5 + ] + } + }, + { + "from": [ + 21.53, + 0.3424499999999995, + 21.34245 + ], + "to": [ + 24.97, + 8.65755, + 29.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 23.25, + 4.5, + 25.5 + ] + } + } + ] +} \ No newline at end of file diff --git a/airdef-mod/assets/airdef/models/block/s400_chassis.json b/airdef-mod/assets/airdef/models/block/s400_chassis.json index 4db2d1e..dfb3714 100644 --- a/airdef-mod/assets/airdef/models/block/s400_chassis.json +++ b/airdef-mod/assets/airdef/models/block/s400_chassis.json @@ -1,12 +1,16 @@ { "ambientocclusion": false, "textures": { + "ru_green_s21": "airdef:block/ru_green_s21", + "ru_green_s31": "airdef:block/ru_green_s31", + "ru_green_s23": "airdef:block/ru_green_s23", + "glass_cab": "airdef:block/glass_cab", "ru_green": "airdef:block/ru_green", - "glass": "airdef:block/glass", "dark_metal": "airdef:block/dark_metal", "metal": "airdef:block/metal", "tire": "airdef:block/tire", - "particle": "airdef:block/ru_green" + "hub": "airdef:block/hub", + "particle": "airdef:block/ru_green_s21" }, "elements": [ { @@ -28,7 +32,7 @@ 16, 5.0 ], - "texture": "#ru_green" + "texture": "#ru_green_s21" }, "south": { "uv": [ @@ -37,7 +41,7 @@ 16, 5.0 ], - "texture": "#ru_green" + "texture": "#ru_green_s21" }, "east": { "uv": [ @@ -46,7 +50,7 @@ 16, 5.0 ], - "texture": "#ru_green" + "texture": "#ru_green_s31" }, "west": { "uv": [ @@ -55,7 +59,7 @@ 16, 5.0 ], - "texture": "#ru_green" + "texture": "#ru_green_s31" }, "up": { "uv": [ @@ -64,7 +68,7 @@ 16, 16 ], - "texture": "#ru_green" + "texture": "#ru_green_s23" }, "down": { "uv": [ @@ -73,7 +77,7 @@ 16, 16 ], - "texture": "#ru_green" + "texture": "#ru_green_s23" } } }, @@ -96,7 +100,7 @@ 9.0, 9.0 ], - "texture": "#glass" + "texture": "#glass_cab" }, "south": { "uv": [ @@ -164,7 +168,7 @@ 9.0, 9.0 ], - "texture": "#glass" + "texture": "#glass_cab" }, "south": { "uv": [ @@ -300,7 +304,7 @@ 16, 3.0 ], - "texture": "#ru_green" + "texture": "#ru_green_s21" }, "south": { "uv": [ @@ -309,7 +313,7 @@ 16, 3.0 ], - "texture": "#ru_green" + "texture": "#ru_green_s21" }, "east": { "uv": [ @@ -336,7 +340,7 @@ 16, 10.0 ], - "texture": "#ru_green" + "texture": "#ru_green_s21" }, "down": { "uv": [ @@ -345,7 +349,7 @@ 16, 10.0 ], - "texture": "#ru_green" + "texture": "#ru_green_s21" } } }, @@ -556,13 +560,13 @@ { "from": [ -9.0, - 0.0, - -14.0 + 0.3424499999999995, + -14.65755 ], "to": [ -5.5, - 9.0, - -7.0 + 8.65755, + -6.3424499999999995 ], "faces": { "north": { @@ -570,7 +574,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -579,7 +583,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -587,26 +591,26 @@ "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -615,7 +619,7 @@ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" } @@ -624,13 +628,13 @@ { "from": [ 21.5, - 0.0, - -14.0 + 0.3424499999999995, + -14.65755 ], "to": [ 25.0, - 9.0, - -7.0 + 8.65755, + -6.3424499999999995 ], "faces": { "north": { @@ -638,7 +642,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -647,7 +651,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -655,26 +659,26 @@ "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -683,22 +687,176 @@ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" } } }, + { + "from": [ + -8.97, + 0.3424499999999995, + -14.65755 + ], + "to": [ + -5.53, + 8.65755, + -6.3424499999999995 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -7.25, + 4.5, + -10.5 + ] + } + }, + { + "from": [ + 21.53, + 0.3424499999999995, + -14.65755 + ], + "to": [ + 24.97, + 8.65755, + -6.3424499999999995 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 23.25, + 4.5, + -10.5 + ] + } + }, { "from": [ -9.0, - 0.0, - -5.0 + 0.3424499999999995, + -5.6575500000000005 ], "to": [ -5.5, - 9.0, - 2.0 + 8.65755, + 2.6575500000000005 ], "faces": { "north": { @@ -706,7 +864,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -715,7 +873,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -723,26 +881,26 @@ "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -751,7 +909,7 @@ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" } @@ -760,13 +918,13 @@ { "from": [ 21.5, - 0.0, - -5.0 + 0.3424499999999995, + -5.6575500000000005 ], "to": [ 25.0, - 9.0, - 2.0 + 8.65755, + 2.6575500000000005 ], "faces": { "north": { @@ -774,7 +932,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -783,7 +941,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -791,26 +949,26 @@ "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -819,22 +977,176 @@ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" } } }, + { + "from": [ + -8.97, + 0.3424499999999995, + -5.6575500000000005 + ], + "to": [ + -5.53, + 8.65755, + 2.6575500000000005 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -7.25, + 4.5, + -1.5 + ] + } + }, + { + "from": [ + 21.53, + 0.3424499999999995, + -5.6575500000000005 + ], + "to": [ + 24.97, + 8.65755, + 2.6575500000000005 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 23.25, + 4.5, + -1.5 + ] + } + }, { "from": [ -9.0, - 0.0, - 13.0 + 0.3424499999999995, + 12.34245 ], "to": [ -5.5, - 9.0, - 20.0 + 8.65755, + 20.65755 ], "faces": { "north": { @@ -842,7 +1154,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -851,7 +1163,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -859,26 +1171,26 @@ "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -887,7 +1199,7 @@ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" } @@ -896,13 +1208,13 @@ { "from": [ 21.5, - 0.0, - 13.0 + 0.3424499999999995, + 12.34245 ], "to": [ 25.0, - 9.0, - 20.0 + 8.65755, + 20.65755 ], "faces": { "north": { @@ -910,7 +1222,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -919,7 +1231,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -927,26 +1239,26 @@ "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -955,22 +1267,176 @@ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" } } }, + { + "from": [ + -8.97, + 0.3424499999999995, + 12.34245 + ], + "to": [ + -5.53, + 8.65755, + 20.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -7.25, + 4.5, + 16.5 + ] + } + }, + { + "from": [ + 21.53, + 0.3424499999999995, + 12.34245 + ], + "to": [ + 24.97, + 8.65755, + 20.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 23.25, + 4.5, + 16.5 + ] + } + }, { "from": [ -9.0, - 0.0, - 22.0 + 0.3424499999999995, + 21.34245 ], "to": [ -5.5, - 9.0, - 29.0 + 8.65755, + 29.65755 ], "faces": { "north": { @@ -978,7 +1444,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -987,7 +1453,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -995,26 +1461,26 @@ "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -1023,7 +1489,7 @@ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" } @@ -1032,13 +1498,13 @@ { "from": [ 21.5, - 0.0, - 22.0 + 0.3424499999999995, + 21.34245 ], "to": [ 25.0, - 9.0, - 29.0 + 8.65755, + 29.65755 ], "faces": { "north": { @@ -1046,7 +1512,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -1055,7 +1521,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -1063,26 +1529,26 @@ "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -1091,11 +1557,165 @@ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" } } + }, + { + "from": [ + -8.97, + 0.3424499999999995, + 21.34245 + ], + "to": [ + -5.53, + 8.65755, + 29.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -7.25, + 4.5, + 25.5 + ] + } + }, + { + "from": [ + 21.53, + 0.3424499999999995, + 21.34245 + ], + "to": [ + 24.97, + 8.65755, + 29.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 23.25, + 4.5, + 25.5 + ] + } } ] } \ No newline at end of file diff --git a/airdef-mod/assets/airdef/models/block/s400_chassis_burnt.json b/airdef-mod/assets/airdef/models/block/s400_chassis_burnt.json new file mode 100644 index 0000000..4898804 --- /dev/null +++ b/airdef-mod/assets/airdef/models/block/s400_chassis_burnt.json @@ -0,0 +1,1653 @@ +{ + "ambientocclusion": false, + "textures": { + "ru_green_s21_b": "airdef:block/ru_green_s21_b", + "ru_green_s31_b": "airdef:block/ru_green_s31_b", + "ru_green_s23_b": "airdef:block/ru_green_s23_b", + "glass_cab_b": "airdef:block/glass_cab_b", + "ru_green_b": "airdef:block/ru_green_b", + "dark_metal_b": "airdef:block/dark_metal_b", + "metal_b": "airdef:block/metal_b", + "tire_b": "airdef:block/tire_b", + "hub_b": "airdef:block/hub_b", + "particle": "airdef:block/ru_green_s21_b" + }, + "elements": [ + { + "from": [ + -6.0, + 5.0, + -16.0 + ], + "to": [ + 22.0, + 10.0, + 32.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 5.0 + ], + "texture": "#ru_green_s21_b" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 5.0 + ], + "texture": "#ru_green_s21_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 5.0 + ], + "texture": "#ru_green_s31_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 5.0 + ], + "texture": "#ru_green_s31_b" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#ru_green_s23_b" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#ru_green_s23_b" + } + } + }, + { + "from": [ + -6.0, + 10.0, + -16.0 + ], + "to": [ + 3.0, + 19.0, + -7.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 9.0, + 9.0 + ], + "texture": "#glass_cab_b" + }, + "south": { + "uv": [ + 0, + 0, + 9.0, + 9.0 + ], + "texture": "#ru_green_b" + }, + "east": { + "uv": [ + 0, + 0, + 9.0, + 9.0 + ], + "texture": "#ru_green_b" + }, + "west": { + "uv": [ + 0, + 0, + 9.0, + 9.0 + ], + "texture": "#ru_green_b" + }, + "up": { + "uv": [ + 0, + 0, + 9.0, + 9.0 + ], + "texture": "#ru_green_b" + }, + "down": { + "uv": [ + 0, + 0, + 9.0, + 9.0 + ], + "texture": "#ru_green_b" + } + } + }, + { + "from": [ + 13.0, + 10.0, + -16.0 + ], + "to": [ + 22.0, + 19.0, + -7.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 9.0, + 9.0 + ], + "texture": "#glass_cab_b" + }, + "south": { + "uv": [ + 0, + 0, + 9.0, + 9.0 + ], + "texture": "#ru_green_b" + }, + "east": { + "uv": [ + 0, + 0, + 9.0, + 9.0 + ], + "texture": "#ru_green_b" + }, + "west": { + "uv": [ + 0, + 0, + 9.0, + 9.0 + ], + "texture": "#ru_green_b" + }, + "up": { + "uv": [ + 0, + 0, + 9.0, + 9.0 + ], + "texture": "#ru_green_b" + }, + "down": { + "uv": [ + 0, + 0, + 9.0, + 9.0 + ], + "texture": "#ru_green_b" + } + } + }, + { + "from": [ + 3.0, + 10.0, + -16.0 + ], + "to": [ + 13.0, + 15.0, + -6.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 10.0, + 5.0 + ], + "texture": "#dark_metal_b" + }, + "south": { + "uv": [ + 0, + 0, + 10.0, + 5.0 + ], + "texture": "#dark_metal_b" + }, + "east": { + "uv": [ + 0, + 0, + 10.0, + 5.0 + ], + "texture": "#dark_metal_b" + }, + "west": { + "uv": [ + 0, + 0, + 10.0, + 5.0 + ], + "texture": "#dark_metal_b" + }, + "up": { + "uv": [ + 0, + 0, + 10.0, + 10.0 + ], + "texture": "#dark_metal_b" + }, + "down": { + "uv": [ + 0, + 0, + 10.0, + 10.0 + ], + "texture": "#dark_metal_b" + } + } + }, + { + "from": [ + -5.0, + 10.0, + -6.0 + ], + "to": [ + 21.0, + 13.0, + 4.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 3.0 + ], + "texture": "#ru_green_s21_b" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 3.0 + ], + "texture": "#ru_green_s21_b" + }, + "east": { + "uv": [ + 0, + 0, + 10.0, + 3.0 + ], + "texture": "#ru_green_b" + }, + "west": { + "uv": [ + 0, + 0, + 10.0, + 3.0 + ], + "texture": "#ru_green_b" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 10.0 + ], + "texture": "#ru_green_s21_b" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 10.0 + ], + "texture": "#ru_green_s21_b" + } + } + }, + { + "from": [ + -3.0, + 10.0, + 26.0 + ], + "to": [ + 19.0, + 14.0, + 32.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#dark_metal_b" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#dark_metal_b" + }, + "east": { + "uv": [ + 0, + 0, + 6.0, + 4.0 + ], + "texture": "#dark_metal_b" + }, + "west": { + "uv": [ + 0, + 0, + 6.0, + 4.0 + ], + "texture": "#dark_metal_b" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 6.0 + ], + "texture": "#dark_metal_b" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 6.0 + ], + "texture": "#dark_metal_b" + } + } + }, + { + "from": [ + 22.0, + 0.0, + 28.0 + ], + "to": [ + 24.0, + 6.0, + 31.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 2.0, + 6.0 + ], + "texture": "#metal_b" + }, + "south": { + "uv": [ + 0, + 0, + 2.0, + 6.0 + ], + "texture": "#metal_b" + }, + "east": { + "uv": [ + 0, + 0, + 3.0, + 6.0 + ], + "texture": "#metal_b" + }, + "west": { + "uv": [ + 0, + 0, + 3.0, + 6.0 + ], + "texture": "#metal_b" + }, + "up": { + "uv": [ + 0, + 0, + 2.0, + 3.0 + ], + "texture": "#metal_b" + }, + "down": { + "uv": [ + 0, + 0, + 2.0, + 3.0 + ], + "texture": "#metal_b" + } + } + }, + { + "from": [ + -9.0, + 0.3424499999999995, + -14.65755 + ], + "to": [ + -5.5, + 8.65755, + -6.3424499999999995 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + } + } + }, + { + "from": [ + 21.5, + 0.3424499999999995, + -14.65755 + ], + "to": [ + 25.0, + 8.65755, + -6.3424499999999995 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + } + } + }, + { + "from": [ + -8.97, + 0.3424499999999995, + -14.65755 + ], + "to": [ + -5.53, + 8.65755, + -6.3424499999999995 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -7.25, + 4.5, + -10.5 + ] + } + }, + { + "from": [ + 21.53, + 0.3424499999999995, + -14.65755 + ], + "to": [ + 24.97, + 8.65755, + -6.3424499999999995 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 23.25, + 4.5, + -10.5 + ] + } + }, + { + "from": [ + -9.0, + 0.3424499999999995, + -5.6575500000000005 + ], + "to": [ + -5.5, + 8.65755, + 2.6575500000000005 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + } + } + }, + { + "from": [ + 21.5, + 0.3424499999999995, + -5.6575500000000005 + ], + "to": [ + 25.0, + 8.65755, + 2.6575500000000005 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + } + } + }, + { + "from": [ + -8.97, + 0.3424499999999995, + -5.6575500000000005 + ], + "to": [ + -5.53, + 8.65755, + 2.6575500000000005 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -7.25, + 4.5, + -1.5 + ] + } + }, + { + "from": [ + 21.53, + 0.3424499999999995, + -5.6575500000000005 + ], + "to": [ + 24.97, + 8.65755, + 2.6575500000000005 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 23.25, + 4.5, + -1.5 + ] + } + }, + { + "from": [ + -9.0, + 0.3424499999999995, + 12.34245 + ], + "to": [ + -5.5, + 8.65755, + 20.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + } + } + }, + { + "from": [ + 21.5, + 0.3424499999999995, + 12.34245 + ], + "to": [ + 25.0, + 8.65755, + 20.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + } + } + }, + { + "from": [ + -8.97, + 0.3424499999999995, + 12.34245 + ], + "to": [ + -5.53, + 8.65755, + 20.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -7.25, + 4.5, + 16.5 + ] + } + }, + { + "from": [ + 21.53, + 0.3424499999999995, + 12.34245 + ], + "to": [ + 24.97, + 8.65755, + 20.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 23.25, + 4.5, + 16.5 + ] + } + }, + { + "from": [ + -9.0, + 0.3424499999999995, + 21.34245 + ], + "to": [ + -5.5, + 8.65755, + 29.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + } + } + }, + { + "from": [ + 21.5, + 0.3424499999999995, + 21.34245 + ], + "to": [ + 25.0, + 8.65755, + 29.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + } + } + }, + { + "from": [ + -8.97, + 0.3424499999999995, + 21.34245 + ], + "to": [ + -5.53, + 8.65755, + 29.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -7.25, + 4.5, + 25.5 + ] + } + }, + { + "from": [ + 21.53, + 0.3424499999999995, + 21.34245 + ], + "to": [ + 24.97, + 8.65755, + 29.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 23.25, + 4.5, + 25.5 + ] + } + } + ] +} \ No newline at end of file diff --git a/airdef-mod/assets/airdef/models/block/s400_tubes.json b/airdef-mod/assets/airdef/models/block/s400_tubes.json index 1ed8ce3..b962ee8 100644 --- a/airdef-mod/assets/airdef/models/block/s400_tubes.json +++ b/airdef-mod/assets/airdef/models/block/s400_tubes.json @@ -1,10 +1,10 @@ { "ambientocclusion": false, "textures": { - "tube": "airdef:block/tube", "tube_cap": "airdef:block/tube_cap", + "tube": "airdef:block/tube", "dark_metal": "airdef:block/dark_metal", - "particle": "airdef:block/tube" + "particle": "airdef:block/tube_cap" }, "elements": [ { diff --git a/airdef-mod/assets/airdef/models/block/s400_tubes_burnt.json b/airdef-mod/assets/airdef/models/block/s400_tubes_burnt.json new file mode 100644 index 0000000..2bc876f --- /dev/null +++ b/airdef-mod/assets/airdef/models/block/s400_tubes_burnt.json @@ -0,0 +1,419 @@ +{ + "ambientocclusion": false, + "textures": { + "tube_cap_b": "airdef:block/tube_cap_b", + "tube_b": "airdef:block/tube_b", + "dark_metal_b": "airdef:block/dark_metal_b", + "particle": "airdef:block/tube_cap_b" + }, + "elements": [ + { + "from": [ + 0.5, + 0.0, + -16.0 + ], + "to": [ + 7.5, + 7.0, + 32.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 7.0, + 7.0 + ], + "texture": "#tube_cap_b" + }, + "south": { + "uv": [ + 0, + 0, + 7.0, + 7.0 + ], + "texture": "#tube_cap_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 7.0 + ], + "texture": "#tube_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 7.0 + ], + "texture": "#tube_b" + }, + "up": { + "uv": [ + 0, + 0, + 7.0, + 16 + ], + "texture": "#tube_b" + }, + "down": { + "uv": [ + 0, + 0, + 7.0, + 16 + ], + "texture": "#tube_b" + } + } + }, + { + "from": [ + 0.5, + 8.0, + -16.0 + ], + "to": [ + 7.5, + 15.0, + 32.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 7.0, + 7.0 + ], + "texture": "#tube_cap_b" + }, + "south": { + "uv": [ + 0, + 0, + 7.0, + 7.0 + ], + "texture": "#tube_cap_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 7.0 + ], + "texture": "#tube_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 7.0 + ], + "texture": "#tube_b" + }, + "up": { + "uv": [ + 0, + 0, + 7.0, + 16 + ], + "texture": "#tube_b" + }, + "down": { + "uv": [ + 0, + 0, + 7.0, + 16 + ], + "texture": "#tube_b" + } + } + }, + { + "from": [ + 8.5, + 0.0, + -16.0 + ], + "to": [ + 15.5, + 7.0, + 32.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 7.0, + 7.0 + ], + "texture": "#tube_cap_b" + }, + "south": { + "uv": [ + 0, + 0, + 7.0, + 7.0 + ], + "texture": "#tube_cap_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 7.0 + ], + "texture": "#tube_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 7.0 + ], + "texture": "#tube_b" + }, + "up": { + "uv": [ + 0, + 0, + 7.0, + 16 + ], + "texture": "#tube_b" + }, + "down": { + "uv": [ + 0, + 0, + 7.0, + 16 + ], + "texture": "#tube_b" + } + } + }, + { + "from": [ + 8.5, + 8.0, + -16.0 + ], + "to": [ + 15.5, + 15.0, + 32.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 7.0, + 7.0 + ], + "texture": "#tube_cap_b" + }, + "south": { + "uv": [ + 0, + 0, + 7.0, + 7.0 + ], + "texture": "#tube_cap_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 7.0 + ], + "texture": "#tube_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 7.0 + ], + "texture": "#tube_b" + }, + "up": { + "uv": [ + 0, + 0, + 7.0, + 16 + ], + "texture": "#tube_b" + }, + "down": { + "uv": [ + 0, + 0, + 7.0, + 16 + ], + "texture": "#tube_b" + } + } + }, + { + "from": [ + -0.5, + 0.0, + 26.0 + ], + "to": [ + 16.5, + 15.0, + 28.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 15.0 + ], + "texture": "#dark_metal_b" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 15.0 + ], + "texture": "#dark_metal_b" + }, + "east": { + "uv": [ + 0, + 0, + 2.0, + 15.0 + ], + "texture": "#dark_metal_b" + }, + "west": { + "uv": [ + 0, + 0, + 2.0, + 15.0 + ], + "texture": "#dark_metal_b" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 2.0 + ], + "texture": "#dark_metal_b" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 2.0 + ], + "texture": "#dark_metal_b" + } + } + }, + { + "from": [ + -0.5, + 0.0, + -2.0 + ], + "to": [ + 16.5, + 15.0, + 0.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 15.0 + ], + "texture": "#dark_metal_b" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 15.0 + ], + "texture": "#dark_metal_b" + }, + "east": { + "uv": [ + 0, + 0, + 2.0, + 15.0 + ], + "texture": "#dark_metal_b" + }, + "west": { + "uv": [ + 0, + 0, + 2.0, + 15.0 + ], + "texture": "#dark_metal_b" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 2.0 + ], + "texture": "#dark_metal_b" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 2.0 + ], + "texture": "#dark_metal_b" + } + } + } + ] +} \ No newline at end of file diff --git a/airdef-mod/assets/airdef/models/block/s500_chassis.json b/airdef-mod/assets/airdef/models/block/s500_chassis.json index be4f125..7e763a3 100644 --- a/airdef-mod/assets/airdef/models/block/s500_chassis.json +++ b/airdef-mod/assets/airdef/models/block/s500_chassis.json @@ -1,12 +1,16 @@ { "ambientocclusion": false, "textures": { + "ru_khaki_s21": "airdef:block/ru_khaki_s21", + "ru_khaki_s31": "airdef:block/ru_khaki_s31", + "ru_khaki_s23": "airdef:block/ru_khaki_s23", + "glass_cab": "airdef:block/glass_cab", "ru_khaki": "airdef:block/ru_khaki", - "glass": "airdef:block/glass", "dark_metal": "airdef:block/dark_metal", "metal": "airdef:block/metal", "tire": "airdef:block/tire", - "particle": "airdef:block/ru_khaki" + "hub": "airdef:block/hub", + "particle": "airdef:block/ru_khaki_s21" }, "elements": [ { @@ -28,7 +32,7 @@ 16, 5.0 ], - "texture": "#ru_khaki" + "texture": "#ru_khaki_s21" }, "south": { "uv": [ @@ -37,7 +41,7 @@ 16, 5.0 ], - "texture": "#ru_khaki" + "texture": "#ru_khaki_s21" }, "east": { "uv": [ @@ -46,7 +50,7 @@ 16, 5.0 ], - "texture": "#ru_khaki" + "texture": "#ru_khaki_s31" }, "west": { "uv": [ @@ -55,7 +59,7 @@ 16, 5.0 ], - "texture": "#ru_khaki" + "texture": "#ru_khaki_s31" }, "up": { "uv": [ @@ -64,7 +68,7 @@ 16, 16 ], - "texture": "#ru_khaki" + "texture": "#ru_khaki_s23" }, "down": { "uv": [ @@ -73,7 +77,7 @@ 16, 16 ], - "texture": "#ru_khaki" + "texture": "#ru_khaki_s23" } } }, @@ -96,7 +100,7 @@ 9.0, 9.0 ], - "texture": "#glass" + "texture": "#glass_cab" }, "south": { "uv": [ @@ -164,7 +168,7 @@ 9.0, 9.0 ], - "texture": "#glass" + "texture": "#glass_cab" }, "south": { "uv": [ @@ -300,7 +304,7 @@ 16, 3.0 ], - "texture": "#ru_khaki" + "texture": "#ru_khaki_s21" }, "south": { "uv": [ @@ -309,7 +313,7 @@ 16, 3.0 ], - "texture": "#ru_khaki" + "texture": "#ru_khaki_s21" }, "east": { "uv": [ @@ -336,7 +340,7 @@ 16, 10.0 ], - "texture": "#ru_khaki" + "texture": "#ru_khaki_s21" }, "down": { "uv": [ @@ -345,7 +349,7 @@ 16, 10.0 ], - "texture": "#ru_khaki" + "texture": "#ru_khaki_s21" } } }, @@ -556,13 +560,13 @@ { "from": [ -9.0, - 0.0, - -14.0 + 0.3424499999999995, + -14.65755 ], "to": [ -5.5, - 9.0, - -7.0 + 8.65755, + -6.3424499999999995 ], "faces": { "north": { @@ -570,7 +574,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -579,7 +583,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -587,26 +591,26 @@ "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -615,7 +619,7 @@ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" } @@ -624,13 +628,13 @@ { "from": [ 21.5, - 0.0, - -14.0 + 0.3424499999999995, + -14.65755 ], "to": [ 25.0, - 9.0, - -7.0 + 8.65755, + -6.3424499999999995 ], "faces": { "north": { @@ -638,7 +642,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -647,7 +651,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -655,26 +659,26 @@ "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -683,22 +687,176 @@ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" } } }, + { + "from": [ + -8.97, + 0.3424499999999995, + -14.65755 + ], + "to": [ + -5.53, + 8.65755, + -6.3424499999999995 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -7.25, + 4.5, + -10.5 + ] + } + }, + { + "from": [ + 21.53, + 0.3424499999999995, + -14.65755 + ], + "to": [ + 24.97, + 8.65755, + -6.3424499999999995 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 23.25, + 4.5, + -10.5 + ] + } + }, { "from": [ -9.0, - 0.0, - -5.0 + 0.3424499999999995, + -5.6575500000000005 ], "to": [ -5.5, - 9.0, - 2.0 + 8.65755, + 2.6575500000000005 ], "faces": { "north": { @@ -706,7 +864,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -715,7 +873,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -723,26 +881,26 @@ "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -751,7 +909,7 @@ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" } @@ -760,13 +918,13 @@ { "from": [ 21.5, - 0.0, - -5.0 + 0.3424499999999995, + -5.6575500000000005 ], "to": [ 25.0, - 9.0, - 2.0 + 8.65755, + 2.6575500000000005 ], "faces": { "north": { @@ -774,7 +932,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -783,7 +941,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -791,26 +949,26 @@ "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -819,22 +977,176 @@ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" } } }, + { + "from": [ + -8.97, + 0.3424499999999995, + -5.6575500000000005 + ], + "to": [ + -5.53, + 8.65755, + 2.6575500000000005 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -7.25, + 4.5, + -1.5 + ] + } + }, + { + "from": [ + 21.53, + 0.3424499999999995, + -5.6575500000000005 + ], + "to": [ + 24.97, + 8.65755, + 2.6575500000000005 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 23.25, + 4.5, + -1.5 + ] + } + }, { "from": [ -9.0, - 0.0, - 13.0 + 0.3424499999999995, + 12.34245 ], "to": [ -5.5, - 9.0, - 20.0 + 8.65755, + 20.65755 ], "faces": { "north": { @@ -842,7 +1154,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -851,7 +1163,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -859,26 +1171,26 @@ "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -887,7 +1199,7 @@ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" } @@ -896,13 +1208,13 @@ { "from": [ 21.5, - 0.0, - 13.0 + 0.3424499999999995, + 12.34245 ], "to": [ 25.0, - 9.0, - 20.0 + 8.65755, + 20.65755 ], "faces": { "north": { @@ -910,7 +1222,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -919,7 +1231,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -927,26 +1239,26 @@ "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -955,22 +1267,176 @@ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" } } }, + { + "from": [ + -8.97, + 0.3424499999999995, + 12.34245 + ], + "to": [ + -5.53, + 8.65755, + 20.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -7.25, + 4.5, + 16.5 + ] + } + }, + { + "from": [ + 21.53, + 0.3424499999999995, + 12.34245 + ], + "to": [ + 24.97, + 8.65755, + 20.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 23.25, + 4.5, + 16.5 + ] + } + }, { "from": [ -9.0, - 0.0, - 22.0 + 0.3424499999999995, + 21.34245 ], "to": [ -5.5, - 9.0, - 29.0 + 8.65755, + 29.65755 ], "faces": { "north": { @@ -978,7 +1444,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -987,7 +1453,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -995,26 +1461,26 @@ "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -1023,7 +1489,7 @@ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" } @@ -1032,13 +1498,13 @@ { "from": [ 21.5, - 0.0, - 22.0 + 0.3424499999999995, + 21.34245 ], "to": [ 25.0, - 9.0, - 29.0 + 8.65755, + 29.65755 ], "faces": { "north": { @@ -1046,7 +1512,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -1055,7 +1521,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -1063,26 +1529,26 @@ "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -1091,11 +1557,165 @@ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" } } + }, + { + "from": [ + -8.97, + 0.3424499999999995, + 21.34245 + ], + "to": [ + -5.53, + 8.65755, + 29.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -7.25, + 4.5, + 25.5 + ] + } + }, + { + "from": [ + 21.53, + 0.3424499999999995, + 21.34245 + ], + "to": [ + 24.97, + 8.65755, + 29.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 23.25, + 4.5, + 25.5 + ] + } } ] } \ No newline at end of file diff --git a/airdef-mod/assets/airdef/models/block/s500_chassis_burnt.json b/airdef-mod/assets/airdef/models/block/s500_chassis_burnt.json new file mode 100644 index 0000000..e4a06d5 --- /dev/null +++ b/airdef-mod/assets/airdef/models/block/s500_chassis_burnt.json @@ -0,0 +1,1653 @@ +{ + "ambientocclusion": false, + "textures": { + "ru_khaki_s21_b": "airdef:block/ru_khaki_s21_b", + "ru_khaki_s31_b": "airdef:block/ru_khaki_s31_b", + "ru_khaki_s23_b": "airdef:block/ru_khaki_s23_b", + "glass_cab_b": "airdef:block/glass_cab_b", + "ru_khaki_b": "airdef:block/ru_khaki_b", + "dark_metal_b": "airdef:block/dark_metal_b", + "metal_b": "airdef:block/metal_b", + "tire_b": "airdef:block/tire_b", + "hub_b": "airdef:block/hub_b", + "particle": "airdef:block/ru_khaki_s21_b" + }, + "elements": [ + { + "from": [ + -6.0, + 5.0, + -16.0 + ], + "to": [ + 22.0, + 10.0, + 32.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 5.0 + ], + "texture": "#ru_khaki_s21_b" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 5.0 + ], + "texture": "#ru_khaki_s21_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 5.0 + ], + "texture": "#ru_khaki_s31_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 5.0 + ], + "texture": "#ru_khaki_s31_b" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#ru_khaki_s23_b" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#ru_khaki_s23_b" + } + } + }, + { + "from": [ + -6.0, + 10.0, + -16.0 + ], + "to": [ + 3.0, + 19.0, + -7.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 9.0, + 9.0 + ], + "texture": "#glass_cab_b" + }, + "south": { + "uv": [ + 0, + 0, + 9.0, + 9.0 + ], + "texture": "#ru_khaki_b" + }, + "east": { + "uv": [ + 0, + 0, + 9.0, + 9.0 + ], + "texture": "#ru_khaki_b" + }, + "west": { + "uv": [ + 0, + 0, + 9.0, + 9.0 + ], + "texture": "#ru_khaki_b" + }, + "up": { + "uv": [ + 0, + 0, + 9.0, + 9.0 + ], + "texture": "#ru_khaki_b" + }, + "down": { + "uv": [ + 0, + 0, + 9.0, + 9.0 + ], + "texture": "#ru_khaki_b" + } + } + }, + { + "from": [ + 13.0, + 10.0, + -16.0 + ], + "to": [ + 22.0, + 19.0, + -7.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 9.0, + 9.0 + ], + "texture": "#glass_cab_b" + }, + "south": { + "uv": [ + 0, + 0, + 9.0, + 9.0 + ], + "texture": "#ru_khaki_b" + }, + "east": { + "uv": [ + 0, + 0, + 9.0, + 9.0 + ], + "texture": "#ru_khaki_b" + }, + "west": { + "uv": [ + 0, + 0, + 9.0, + 9.0 + ], + "texture": "#ru_khaki_b" + }, + "up": { + "uv": [ + 0, + 0, + 9.0, + 9.0 + ], + "texture": "#ru_khaki_b" + }, + "down": { + "uv": [ + 0, + 0, + 9.0, + 9.0 + ], + "texture": "#ru_khaki_b" + } + } + }, + { + "from": [ + 3.0, + 10.0, + -16.0 + ], + "to": [ + 13.0, + 15.0, + -6.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 10.0, + 5.0 + ], + "texture": "#dark_metal_b" + }, + "south": { + "uv": [ + 0, + 0, + 10.0, + 5.0 + ], + "texture": "#dark_metal_b" + }, + "east": { + "uv": [ + 0, + 0, + 10.0, + 5.0 + ], + "texture": "#dark_metal_b" + }, + "west": { + "uv": [ + 0, + 0, + 10.0, + 5.0 + ], + "texture": "#dark_metal_b" + }, + "up": { + "uv": [ + 0, + 0, + 10.0, + 10.0 + ], + "texture": "#dark_metal_b" + }, + "down": { + "uv": [ + 0, + 0, + 10.0, + 10.0 + ], + "texture": "#dark_metal_b" + } + } + }, + { + "from": [ + -5.0, + 10.0, + -6.0 + ], + "to": [ + 21.0, + 13.0, + 4.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 3.0 + ], + "texture": "#ru_khaki_s21_b" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 3.0 + ], + "texture": "#ru_khaki_s21_b" + }, + "east": { + "uv": [ + 0, + 0, + 10.0, + 3.0 + ], + "texture": "#ru_khaki_b" + }, + "west": { + "uv": [ + 0, + 0, + 10.0, + 3.0 + ], + "texture": "#ru_khaki_b" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 10.0 + ], + "texture": "#ru_khaki_s21_b" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 10.0 + ], + "texture": "#ru_khaki_s21_b" + } + } + }, + { + "from": [ + -3.0, + 10.0, + 26.0 + ], + "to": [ + 19.0, + 14.0, + 32.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#dark_metal_b" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#dark_metal_b" + }, + "east": { + "uv": [ + 0, + 0, + 6.0, + 4.0 + ], + "texture": "#dark_metal_b" + }, + "west": { + "uv": [ + 0, + 0, + 6.0, + 4.0 + ], + "texture": "#dark_metal_b" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 6.0 + ], + "texture": "#dark_metal_b" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 6.0 + ], + "texture": "#dark_metal_b" + } + } + }, + { + "from": [ + -8.0, + 0.0, + 28.0 + ], + "to": [ + -6.0, + 6.0, + 31.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 2.0, + 6.0 + ], + "texture": "#metal_b" + }, + "south": { + "uv": [ + 0, + 0, + 2.0, + 6.0 + ], + "texture": "#metal_b" + }, + "east": { + "uv": [ + 0, + 0, + 3.0, + 6.0 + ], + "texture": "#metal_b" + }, + "west": { + "uv": [ + 0, + 0, + 3.0, + 6.0 + ], + "texture": "#metal_b" + }, + "up": { + "uv": [ + 0, + 0, + 2.0, + 3.0 + ], + "texture": "#metal_b" + }, + "down": { + "uv": [ + 0, + 0, + 2.0, + 3.0 + ], + "texture": "#metal_b" + } + } + }, + { + "from": [ + -9.0, + 0.3424499999999995, + -14.65755 + ], + "to": [ + -5.5, + 8.65755, + -6.3424499999999995 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + } + } + }, + { + "from": [ + 21.5, + 0.3424499999999995, + -14.65755 + ], + "to": [ + 25.0, + 8.65755, + -6.3424499999999995 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + } + } + }, + { + "from": [ + -8.97, + 0.3424499999999995, + -14.65755 + ], + "to": [ + -5.53, + 8.65755, + -6.3424499999999995 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -7.25, + 4.5, + -10.5 + ] + } + }, + { + "from": [ + 21.53, + 0.3424499999999995, + -14.65755 + ], + "to": [ + 24.97, + 8.65755, + -6.3424499999999995 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 23.25, + 4.5, + -10.5 + ] + } + }, + { + "from": [ + -9.0, + 0.3424499999999995, + -5.6575500000000005 + ], + "to": [ + -5.5, + 8.65755, + 2.6575500000000005 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + } + } + }, + { + "from": [ + 21.5, + 0.3424499999999995, + -5.6575500000000005 + ], + "to": [ + 25.0, + 8.65755, + 2.6575500000000005 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + } + } + }, + { + "from": [ + -8.97, + 0.3424499999999995, + -5.6575500000000005 + ], + "to": [ + -5.53, + 8.65755, + 2.6575500000000005 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -7.25, + 4.5, + -1.5 + ] + } + }, + { + "from": [ + 21.53, + 0.3424499999999995, + -5.6575500000000005 + ], + "to": [ + 24.97, + 8.65755, + 2.6575500000000005 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 23.25, + 4.5, + -1.5 + ] + } + }, + { + "from": [ + -9.0, + 0.3424499999999995, + 12.34245 + ], + "to": [ + -5.5, + 8.65755, + 20.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + } + } + }, + { + "from": [ + 21.5, + 0.3424499999999995, + 12.34245 + ], + "to": [ + 25.0, + 8.65755, + 20.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + } + } + }, + { + "from": [ + -8.97, + 0.3424499999999995, + 12.34245 + ], + "to": [ + -5.53, + 8.65755, + 20.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -7.25, + 4.5, + 16.5 + ] + } + }, + { + "from": [ + 21.53, + 0.3424499999999995, + 12.34245 + ], + "to": [ + 24.97, + 8.65755, + 20.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 23.25, + 4.5, + 16.5 + ] + } + }, + { + "from": [ + -9.0, + 0.3424499999999995, + 21.34245 + ], + "to": [ + -5.5, + 8.65755, + 29.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + } + } + }, + { + "from": [ + 21.5, + 0.3424499999999995, + 21.34245 + ], + "to": [ + 25.0, + 8.65755, + 29.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + } + } + }, + { + "from": [ + -8.97, + 0.3424499999999995, + 21.34245 + ], + "to": [ + -5.53, + 8.65755, + 29.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -7.25, + 4.5, + 25.5 + ] + } + }, + { + "from": [ + 21.53, + 0.3424499999999995, + 21.34245 + ], + "to": [ + 24.97, + 8.65755, + 29.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 23.25, + 4.5, + 25.5 + ] + } + } + ] +} \ No newline at end of file diff --git a/airdef-mod/assets/airdef/models/block/s500_tubes.json b/airdef-mod/assets/airdef/models/block/s500_tubes.json index 964fbf5..f626dcd 100644 --- a/airdef-mod/assets/airdef/models/block/s500_tubes.json +++ b/airdef-mod/assets/airdef/models/block/s500_tubes.json @@ -1,10 +1,10 @@ { "ambientocclusion": false, "textures": { - "tube": "airdef:block/tube", "tube_cap": "airdef:block/tube_cap", + "tube": "airdef:block/tube", "dark_metal": "airdef:block/dark_metal", - "particle": "airdef:block/tube" + "particle": "airdef:block/tube_cap" }, "elements": [ { diff --git a/airdef-mod/assets/airdef/models/block/s500_tubes_burnt.json b/airdef-mod/assets/airdef/models/block/s500_tubes_burnt.json new file mode 100644 index 0000000..3208fab --- /dev/null +++ b/airdef-mod/assets/airdef/models/block/s500_tubes_burnt.json @@ -0,0 +1,283 @@ +{ + "ambientocclusion": false, + "textures": { + "tube_cap_b": "airdef:block/tube_cap_b", + "tube_b": "airdef:block/tube_b", + "dark_metal_b": "airdef:block/dark_metal_b", + "particle": "airdef:block/tube_cap_b" + }, + "elements": [ + { + "from": [ + -2.0, + 0.0, + -16.0 + ], + "to": [ + 7.5, + 9.5, + 32.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 9.5, + 9.5 + ], + "texture": "#tube_cap_b" + }, + "south": { + "uv": [ + 0, + 0, + 9.5, + 9.5 + ], + "texture": "#tube_cap_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 9.5 + ], + "texture": "#tube_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 9.5 + ], + "texture": "#tube_b" + }, + "up": { + "uv": [ + 0, + 0, + 9.5, + 16 + ], + "texture": "#tube_b" + }, + "down": { + "uv": [ + 0, + 0, + 9.5, + 16 + ], + "texture": "#tube_b" + } + } + }, + { + "from": [ + 8.5, + 0.0, + -16.0 + ], + "to": [ + 18.0, + 9.5, + 32.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 9.5, + 9.5 + ], + "texture": "#tube_cap_b" + }, + "south": { + "uv": [ + 0, + 0, + 9.5, + 9.5 + ], + "texture": "#tube_cap_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 9.5 + ], + "texture": "#tube_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 9.5 + ], + "texture": "#tube_b" + }, + "up": { + "uv": [ + 0, + 0, + 9.5, + 16 + ], + "texture": "#tube_b" + }, + "down": { + "uv": [ + 0, + 0, + 9.5, + 16 + ], + "texture": "#tube_b" + } + } + }, + { + "from": [ + -3.0, + 0.0, + 26.0 + ], + "to": [ + 19.0, + 9.5, + 28.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 9.5 + ], + "texture": "#dark_metal_b" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 9.5 + ], + "texture": "#dark_metal_b" + }, + "east": { + "uv": [ + 0, + 0, + 2.0, + 9.5 + ], + "texture": "#dark_metal_b" + }, + "west": { + "uv": [ + 0, + 0, + 2.0, + 9.5 + ], + "texture": "#dark_metal_b" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 2.0 + ], + "texture": "#dark_metal_b" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 2.0 + ], + "texture": "#dark_metal_b" + } + } + }, + { + "from": [ + -3.0, + 0.0, + -2.0 + ], + "to": [ + 19.0, + 9.5, + 0.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 9.5 + ], + "texture": "#dark_metal_b" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 9.5 + ], + "texture": "#dark_metal_b" + }, + "east": { + "uv": [ + 0, + 0, + 2.0, + 9.5 + ], + "texture": "#dark_metal_b" + }, + "west": { + "uv": [ + 0, + 0, + 2.0, + 9.5 + ], + "texture": "#dark_metal_b" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 2.0 + ], + "texture": "#dark_metal_b" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 2.0 + ], + "texture": "#dark_metal_b" + } + } + } + ] +} \ No newline at end of file diff --git a/airdef-mod/assets/airdef/models/block/searchlight_burnt.json b/airdef-mod/assets/airdef/models/block/searchlight_burnt.json new file mode 100644 index 0000000..0f29afc --- /dev/null +++ b/airdef-mod/assets/airdef/models/block/searchlight_burnt.json @@ -0,0 +1,145 @@ +{ + "ambientocclusion": false, + "textures": { + "dark_metal_b": "airdef:block/dark_metal_b", + "particle": "airdef:block/dark_metal_b" + }, + "elements": [ + { + "from": [ + 2.0, + 0.0, + 2.0 + ], + "to": [ + 14.0, + 3.0, + 14.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 12.0, + 3.0 + ], + "texture": "#dark_metal_b" + }, + "south": { + "uv": [ + 0, + 0, + 12.0, + 3.0 + ], + "texture": "#dark_metal_b" + }, + "east": { + "uv": [ + 0, + 0, + 12.0, + 3.0 + ], + "texture": "#dark_metal_b" + }, + "west": { + "uv": [ + 0, + 0, + 12.0, + 3.0 + ], + "texture": "#dark_metal_b" + }, + "up": { + "uv": [ + 0, + 0, + 12.0, + 12.0 + ], + "texture": "#dark_metal_b" + }, + "down": { + "uv": [ + 0, + 0, + 12.0, + 12.0 + ], + "texture": "#dark_metal_b" + } + } + }, + { + "from": [ + 6.0, + 3.0, + 6.0 + ], + "to": [ + 10.0, + 12.0, + 10.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 4.0, + 9.0 + ], + "texture": "#dark_metal_b" + }, + "south": { + "uv": [ + 0, + 0, + 4.0, + 9.0 + ], + "texture": "#dark_metal_b" + }, + "east": { + "uv": [ + 0, + 0, + 4.0, + 9.0 + ], + "texture": "#dark_metal_b" + }, + "west": { + "uv": [ + 0, + 0, + 4.0, + 9.0 + ], + "texture": "#dark_metal_b" + }, + "up": { + "uv": [ + 0, + 0, + 4.0, + 4.0 + ], + "texture": "#dark_metal_b" + }, + "down": { + "uv": [ + 0, + 0, + 4.0, + 4.0 + ], + "texture": "#dark_metal_b" + } + } + } + ] +} \ No newline at end of file diff --git a/airdef-mod/assets/airdef/models/block/searchlight_head_burnt.json b/airdef-mod/assets/airdef/models/block/searchlight_head_burnt.json new file mode 100644 index 0000000..90b3557 --- /dev/null +++ b/airdef-mod/assets/airdef/models/block/searchlight_head_burnt.json @@ -0,0 +1,146 @@ +{ + "ambientocclusion": false, + "textures": { + "dark_metal_b": "airdef:block/dark_metal_b", + "lamp_b": "airdef:block/lamp_b", + "particle": "airdef:block/dark_metal_b" + }, + "elements": [ + { + "from": [ + 3.0, + 3.0, + -2.0 + ], + "to": [ + 13.0, + 13.0, + 14.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 10.0, + 10.0 + ], + "texture": "#dark_metal_b" + }, + "south": { + "uv": [ + 0, + 0, + 10.0, + 10.0 + ], + "texture": "#dark_metal_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 10.0 + ], + "texture": "#dark_metal_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 10.0 + ], + "texture": "#dark_metal_b" + }, + "up": { + "uv": [ + 0, + 0, + 10.0, + 16 + ], + "texture": "#dark_metal_b" + }, + "down": { + "uv": [ + 0, + 0, + 10.0, + 16 + ], + "texture": "#dark_metal_b" + } + } + }, + { + "from": [ + 3.5, + 3.5, + -2.5 + ], + "to": [ + 12.5, + 12.5, + -2.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 9.0, + 9.0 + ], + "texture": "#lamp_b" + }, + "south": { + "uv": [ + 0, + 0, + 9.0, + 9.0 + ], + "texture": "#lamp_b" + }, + "east": { + "uv": [ + 0, + 0, + 0.5, + 9.0 + ], + "texture": "#lamp_b" + }, + "west": { + "uv": [ + 0, + 0, + 0.5, + 9.0 + ], + "texture": "#lamp_b" + }, + "up": { + "uv": [ + 0, + 0, + 9.0, + 0.5 + ], + "texture": "#lamp_b" + }, + "down": { + "uv": [ + 0, + 0, + 9.0, + 0.5 + ], + "texture": "#lamp_b" + } + } + } + ] +} \ No newline at end of file diff --git a/airdef-mod/assets/airdef/models/block/tor_chassis.json b/airdef-mod/assets/airdef/models/block/tor_chassis.json index 9cfe4b9..768a715 100644 --- a/airdef-mod/assets/airdef/models/block/tor_chassis.json +++ b/airdef-mod/assets/airdef/models/block/tor_chassis.json @@ -1,10 +1,17 @@ { "ambientocclusion": false, "textures": { + "ru_khaki_s21": "airdef:block/ru_khaki_s21", + "ru_khaki_s31": "airdef:block/ru_khaki_s31", + "ru_khaki_s23": "airdef:block/ru_khaki_s23", "ru_khaki": "airdef:block/ru_khaki", "dark_metal": "airdef:block/dark_metal", + "bare_nozzle": "airdef:block/bare_nozzle", "track": "airdef:block/track", - "particle": "airdef:block/ru_khaki" + "track_side_s31": "airdef:block/track_side_s31", + "ru_khaki_s13": "airdef:block/ru_khaki_s13", + "bare_lamp": "airdef:block/bare_lamp", + "particle": "airdef:block/ru_khaki_s21" }, "elements": [ { @@ -26,7 +33,7 @@ 16, 11.0 ], - "texture": "#ru_khaki" + "texture": "#ru_khaki_s21" }, "south": { "uv": [ @@ -35,7 +42,7 @@ 16, 11.0 ], - "texture": "#ru_khaki" + "texture": "#ru_khaki_s21" }, "east": { "uv": [ @@ -44,7 +51,7 @@ 16, 11.0 ], - "texture": "#ru_khaki" + "texture": "#ru_khaki_s31" }, "west": { "uv": [ @@ -53,7 +60,7 @@ 16, 11.0 ], - "texture": "#ru_khaki" + "texture": "#ru_khaki_s31" }, "up": { "uv": [ @@ -62,7 +69,7 @@ 16, 16 ], - "texture": "#ru_khaki" + "texture": "#ru_khaki_s23" }, "down": { "uv": [ @@ -71,7 +78,7 @@ 16, 16 ], - "texture": "#ru_khaki" + "texture": "#ru_khaki_s23" } } }, @@ -94,7 +101,7 @@ 16, 6.0 ], - "texture": "#ru_khaki" + "texture": "#ru_khaki_s21" }, "south": { "uv": [ @@ -103,7 +110,7 @@ 16, 6.0 ], - "texture": "#ru_khaki" + "texture": "#ru_khaki_s21" }, "east": { "uv": [ @@ -130,7 +137,7 @@ 16, 2.0 ], - "texture": "#ru_khaki" + "texture": "#ru_khaki_s21" }, "down": { "uv": [ @@ -139,10 +146,87 @@ 16, 2.0 ], - "texture": "#ru_khaki" + "texture": "#ru_khaki_s21" } } }, + { + "from": [ + -9.0, + 10.0, + -15.0 + ], + "to": [ + 25.0, + 14.0, + -12.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#ru_khaki_s21" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#ru_khaki_s21" + }, + "east": { + "uv": [ + 0, + 0, + 3.0, + 4.0 + ], + "texture": "#ru_khaki" + }, + "west": { + "uv": [ + 0, + 0, + 3.0, + 4.0 + ], + "texture": "#ru_khaki" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 3.0 + ], + "texture": "#ru_khaki_s21" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 3.0 + ], + "texture": "#ru_khaki_s21" + } + }, + "rotation": { + "angle": -22.5, + "axis": "x", + "origin": [ + 8.0, + 12.0, + -13.5 + ] + } + }, { "from": [ -8.0, @@ -211,6 +295,142 @@ } } }, + { + "from": [ + -5.0, + 15.2, + 24.0 + ], + "to": [ + 21.0, + 15.8, + 31.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 0.6000000000000014 + ], + "texture": "#bare_nozzle" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 0.6000000000000014 + ], + "texture": "#bare_nozzle" + }, + "east": { + "uv": [ + 0, + 0, + 7.0, + 0.6000000000000014 + ], + "texture": "#bare_nozzle" + }, + "west": { + "uv": [ + 0, + 0, + 7.0, + 0.6000000000000014 + ], + "texture": "#bare_nozzle" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 7.0 + ], + "texture": "#bare_nozzle" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 7.0 + ], + "texture": "#bare_nozzle" + } + } + }, + { + "from": [ + -1.0, + 15.0, + -10.0 + ], + "to": [ + 9.0, + 16.0, + -4.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 10.0, + 1.0 + ], + "texture": "#dark_metal" + }, + "south": { + "uv": [ + 0, + 0, + 10.0, + 1.0 + ], + "texture": "#dark_metal" + }, + "east": { + "uv": [ + 0, + 0, + 6.0, + 1.0 + ], + "texture": "#dark_metal" + }, + "west": { + "uv": [ + 0, + 0, + 6.0, + 1.0 + ], + "texture": "#dark_metal" + }, + "up": { + "uv": [ + 0, + 0, + 10.0, + 6.0 + ], + "texture": "#dark_metal" + }, + "down": { + "uv": [ + 0, + 0, + 10.0, + 6.0 + ], + "texture": "#dark_metal" + } + } + }, { "from": [ -14.0, @@ -248,7 +468,7 @@ 16, 9.0 ], - "texture": "#track" + "texture": "#track_side_s31" }, "west": { "uv": [ @@ -257,7 +477,7 @@ 16, 9.0 ], - "texture": "#track" + "texture": "#track_side_s31" }, "up": { "uv": [ @@ -316,7 +536,7 @@ 16, 9.0 ], - "texture": "#track" + "texture": "#track_side_s31" }, "west": { "uv": [ @@ -325,7 +545,7 @@ 16, 9.0 ], - "texture": "#track" + "texture": "#track_side_s31" }, "up": { "uv": [ @@ -384,7 +604,7 @@ 16, 5.0 ], - "texture": "#ru_khaki" + "texture": "#ru_khaki_s31" }, "west": { "uv": [ @@ -393,7 +613,7 @@ 16, 5.0 ], - "texture": "#ru_khaki" + "texture": "#ru_khaki_s31" }, "up": { "uv": [ @@ -402,7 +622,7 @@ 4.5, 16 ], - "texture": "#ru_khaki" + "texture": "#ru_khaki_s13" }, "down": { "uv": [ @@ -411,7 +631,7 @@ 4.5, 16 ], - "texture": "#ru_khaki" + "texture": "#ru_khaki_s13" } } }, @@ -452,7 +672,7 @@ 16, 5.0 ], - "texture": "#ru_khaki" + "texture": "#ru_khaki_s31" }, "west": { "uv": [ @@ -461,7 +681,7 @@ 16, 5.0 ], - "texture": "#ru_khaki" + "texture": "#ru_khaki_s31" }, "up": { "uv": [ @@ -470,7 +690,7 @@ 4.5, 16 ], - "texture": "#ru_khaki" + "texture": "#ru_khaki_s13" }, "down": { "uv": [ @@ -479,7 +699,143 @@ 4.5, 16 ], - "texture": "#ru_khaki" + "texture": "#ru_khaki_s13" + } + } + }, + { + "from": [ + -4.0, + 11.0, + -16.0 + ], + "to": [ + -1.0, + 13.0, + -15.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.0, + 2.0 + ], + "texture": "#bare_lamp" + }, + "south": { + "uv": [ + 0, + 0, + 3.0, + 2.0 + ], + "texture": "#bare_lamp" + }, + "east": { + "uv": [ + 0, + 0, + 1.0, + 2.0 + ], + "texture": "#bare_lamp" + }, + "west": { + "uv": [ + 0, + 0, + 1.0, + 2.0 + ], + "texture": "#bare_lamp" + }, + "up": { + "uv": [ + 0, + 0, + 3.0, + 1.0 + ], + "texture": "#bare_lamp" + }, + "down": { + "uv": [ + 0, + 0, + 3.0, + 1.0 + ], + "texture": "#bare_lamp" + } + } + }, + { + "from": [ + 17.0, + 11.0, + -16.0 + ], + "to": [ + 20.0, + 13.0, + -15.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.0, + 2.0 + ], + "texture": "#bare_lamp" + }, + "south": { + "uv": [ + 0, + 0, + 3.0, + 2.0 + ], + "texture": "#bare_lamp" + }, + "east": { + "uv": [ + 0, + 0, + 1.0, + 2.0 + ], + "texture": "#bare_lamp" + }, + "west": { + "uv": [ + 0, + 0, + 1.0, + 2.0 + ], + "texture": "#bare_lamp" + }, + "up": { + "uv": [ + 0, + 0, + 3.0, + 1.0 + ], + "texture": "#bare_lamp" + }, + "down": { + "uv": [ + 0, + 0, + 3.0, + 1.0 + ], + "texture": "#bare_lamp" } } } diff --git a/airdef-mod/assets/airdef/models/block/tor_chassis_burnt.json b/airdef-mod/assets/airdef/models/block/tor_chassis_burnt.json new file mode 100644 index 0000000..b609b71 --- /dev/null +++ b/airdef-mod/assets/airdef/models/block/tor_chassis_burnt.json @@ -0,0 +1,775 @@ +{ + "ambientocclusion": false, + "textures": { + "ru_khaki_s21_b": "airdef:block/ru_khaki_s21_b", + "ru_khaki_s31_b": "airdef:block/ru_khaki_s31_b", + "ru_khaki_s23_b": "airdef:block/ru_khaki_s23_b", + "ru_khaki_b": "airdef:block/ru_khaki_b", + "dark_metal_b": "airdef:block/dark_metal_b", + "bare_nozzle_b": "airdef:block/bare_nozzle_b", + "track_b": "airdef:block/track_b", + "track_side_s31_b": "airdef:block/track_side_s31_b", + "ru_khaki_s13_b": "airdef:block/ru_khaki_s13_b", + "bare_lamp_b": "airdef:block/bare_lamp_b", + "particle": "airdef:block/ru_khaki_s21_b" + }, + "elements": [ + { + "from": [ + -10.0, + 4.0, + -14.0 + ], + "to": [ + 26.0, + 15.0, + 32.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 11.0 + ], + "texture": "#ru_khaki_s21_b" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 11.0 + ], + "texture": "#ru_khaki_s21_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 11.0 + ], + "texture": "#ru_khaki_s31_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 11.0 + ], + "texture": "#ru_khaki_s31_b" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#ru_khaki_s23_b" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#ru_khaki_s23_b" + } + } + }, + { + "from": [ + -10.0, + 4.0, + -16.0 + ], + "to": [ + 26.0, + 10.0, + -14.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 6.0 + ], + "texture": "#ru_khaki_s21_b" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 6.0 + ], + "texture": "#ru_khaki_s21_b" + }, + "east": { + "uv": [ + 0, + 0, + 2.0, + 6.0 + ], + "texture": "#ru_khaki_b" + }, + "west": { + "uv": [ + 0, + 0, + 2.0, + 6.0 + ], + "texture": "#ru_khaki_b" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 2.0 + ], + "texture": "#ru_khaki_s21_b" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 2.0 + ], + "texture": "#ru_khaki_s21_b" + } + } + }, + { + "from": [ + -9.0, + 10.0, + -15.0 + ], + "to": [ + 25.0, + 14.0, + -12.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#ru_khaki_s21_b" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#ru_khaki_s21_b" + }, + "east": { + "uv": [ + 0, + 0, + 3.0, + 4.0 + ], + "texture": "#ru_khaki_b" + }, + "west": { + "uv": [ + 0, + 0, + 3.0, + 4.0 + ], + "texture": "#ru_khaki_b" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 3.0 + ], + "texture": "#ru_khaki_s21_b" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 3.0 + ], + "texture": "#ru_khaki_s21_b" + } + }, + "rotation": { + "angle": -22.5, + "axis": "x", + "origin": [ + 8.0, + 12.0, + -13.5 + ] + } + }, + { + "from": [ + -8.0, + 15.0, + 22.0 + ], + "to": [ + 24.0, + 16.0, + 32.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 1.0 + ], + "texture": "#dark_metal_b" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 1.0 + ], + "texture": "#dark_metal_b" + }, + "east": { + "uv": [ + 0, + 0, + 10.0, + 1.0 + ], + "texture": "#dark_metal_b" + }, + "west": { + "uv": [ + 0, + 0, + 10.0, + 1.0 + ], + "texture": "#dark_metal_b" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 10.0 + ], + "texture": "#dark_metal_b" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 10.0 + ], + "texture": "#dark_metal_b" + } + } + }, + { + "from": [ + -5.0, + 15.2, + 24.0 + ], + "to": [ + 21.0, + 15.8, + 31.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 0.6000000000000014 + ], + "texture": "#bare_nozzle_b" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 0.6000000000000014 + ], + "texture": "#bare_nozzle_b" + }, + "east": { + "uv": [ + 0, + 0, + 7.0, + 0.6000000000000014 + ], + "texture": "#bare_nozzle_b" + }, + "west": { + "uv": [ + 0, + 0, + 7.0, + 0.6000000000000014 + ], + "texture": "#bare_nozzle_b" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 7.0 + ], + "texture": "#bare_nozzle_b" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 7.0 + ], + "texture": "#bare_nozzle_b" + } + } + }, + { + "from": [ + -1.0, + 15.0, + -10.0 + ], + "to": [ + 9.0, + 16.0, + -4.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 10.0, + 1.0 + ], + "texture": "#dark_metal_b" + }, + "south": { + "uv": [ + 0, + 0, + 10.0, + 1.0 + ], + "texture": "#dark_metal_b" + }, + "east": { + "uv": [ + 0, + 0, + 6.0, + 1.0 + ], + "texture": "#dark_metal_b" + }, + "west": { + "uv": [ + 0, + 0, + 6.0, + 1.0 + ], + "texture": "#dark_metal_b" + }, + "up": { + "uv": [ + 0, + 0, + 10.0, + 6.0 + ], + "texture": "#dark_metal_b" + }, + "down": { + "uv": [ + 0, + 0, + 10.0, + 6.0 + ], + "texture": "#dark_metal_b" + } + } + }, + { + "from": [ + -14.0, + 0.0, + -15.0 + ], + "to": [ + -10.0, + 9.0, + 31.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 4.0, + 9.0 + ], + "texture": "#track_b" + }, + "south": { + "uv": [ + 0, + 0, + 4.0, + 9.0 + ], + "texture": "#track_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 9.0 + ], + "texture": "#track_side_s31_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 9.0 + ], + "texture": "#track_side_s31_b" + }, + "up": { + "uv": [ + 0, + 0, + 4.0, + 16 + ], + "texture": "#track_b" + }, + "down": { + "uv": [ + 0, + 0, + 4.0, + 16 + ], + "texture": "#track_b" + } + } + }, + { + "from": [ + 26.0, + 0.0, + -15.0 + ], + "to": [ + 30.0, + 9.0, + 31.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 4.0, + 9.0 + ], + "texture": "#track_b" + }, + "south": { + "uv": [ + 0, + 0, + 4.0, + 9.0 + ], + "texture": "#track_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 9.0 + ], + "texture": "#track_side_s31_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 9.0 + ], + "texture": "#track_side_s31_b" + }, + "up": { + "uv": [ + 0, + 0, + 4.0, + 16 + ], + "texture": "#track_b" + }, + "down": { + "uv": [ + 0, + 0, + 4.0, + 16 + ], + "texture": "#track_b" + } + } + }, + { + "from": [ + -14.5, + 5.0, + -15.0 + ], + "to": [ + -10.0, + 10.0, + 31.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 4.5, + 5.0 + ], + "texture": "#ru_khaki_b" + }, + "south": { + "uv": [ + 0, + 0, + 4.5, + 5.0 + ], + "texture": "#ru_khaki_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 5.0 + ], + "texture": "#ru_khaki_s31_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 5.0 + ], + "texture": "#ru_khaki_s31_b" + }, + "up": { + "uv": [ + 0, + 0, + 4.5, + 16 + ], + "texture": "#ru_khaki_s13_b" + }, + "down": { + "uv": [ + 0, + 0, + 4.5, + 16 + ], + "texture": "#ru_khaki_s13_b" + } + } + }, + { + "from": [ + 26.0, + 5.0, + -15.0 + ], + "to": [ + 30.5, + 10.0, + 31.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 4.5, + 5.0 + ], + "texture": "#ru_khaki_b" + }, + "south": { + "uv": [ + 0, + 0, + 4.5, + 5.0 + ], + "texture": "#ru_khaki_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 5.0 + ], + "texture": "#ru_khaki_s31_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 5.0 + ], + "texture": "#ru_khaki_s31_b" + }, + "up": { + "uv": [ + 0, + 0, + 4.5, + 16 + ], + "texture": "#ru_khaki_s13_b" + }, + "down": { + "uv": [ + 0, + 0, + 4.5, + 16 + ], + "texture": "#ru_khaki_s13_b" + } + } + }, + { + "from": [ + 17.0, + 11.0, + -16.0 + ], + "to": [ + 20.0, + 13.0, + -15.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.0, + 2.0 + ], + "texture": "#bare_lamp_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.0, + 2.0 + ], + "texture": "#bare_lamp_b" + }, + "east": { + "uv": [ + 0, + 0, + 1.0, + 2.0 + ], + "texture": "#bare_lamp_b" + }, + "west": { + "uv": [ + 0, + 0, + 1.0, + 2.0 + ], + "texture": "#bare_lamp_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.0, + 1.0 + ], + "texture": "#bare_lamp_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.0, + 1.0 + ], + "texture": "#bare_lamp_b" + } + } + } + ] +} \ No newline at end of file diff --git a/airdef-mod/assets/airdef/models/block/tor_turret.json b/airdef-mod/assets/airdef/models/block/tor_turret.json index f73b657..c3bd5db 100644 --- a/airdef-mod/assets/airdef/models/block/tor_turret.json +++ b/airdef-mod/assets/airdef/models/block/tor_turret.json @@ -1,11 +1,12 @@ { "ambientocclusion": false, "textures": { - "ru_khaki": "airdef:block/ru_khaki", + "ru_khaki_s21": "airdef:block/ru_khaki_s21", + "ru_khaki_s22": "airdef:block/ru_khaki_s22", "radar_face": "airdef:block/radar_face", "dark_metal": "airdef:block/dark_metal", "tube_cap": "airdef:block/tube_cap", - "particle": "airdef:block/ru_khaki" + "particle": "airdef:block/ru_khaki_s21" }, "elements": [ { @@ -27,7 +28,7 @@ 16, 16 ], - "texture": "#ru_khaki" + "texture": "#ru_khaki_s21" }, "south": { "uv": [ @@ -36,7 +37,7 @@ 16, 16 ], - "texture": "#ru_khaki" + "texture": "#ru_khaki_s21" }, "east": { "uv": [ @@ -45,7 +46,7 @@ 16, 16 ], - "texture": "#ru_khaki" + "texture": "#ru_khaki_s21" }, "west": { "uv": [ @@ -54,7 +55,7 @@ 16, 16 ], - "texture": "#ru_khaki" + "texture": "#ru_khaki_s21" }, "up": { "uv": [ @@ -63,7 +64,7 @@ 16, 16 ], - "texture": "#ru_khaki" + "texture": "#ru_khaki_s22" }, "down": { "uv": [ @@ -72,7 +73,7 @@ 16, 16 ], - "texture": "#ru_khaki" + "texture": "#ru_khaki_s22" } } }, diff --git a/airdef-mod/assets/airdef/models/block/tor_turret_burnt.json b/airdef-mod/assets/airdef/models/block/tor_turret_burnt.json new file mode 100644 index 0000000..0f681c4 --- /dev/null +++ b/airdef-mod/assets/airdef/models/block/tor_turret_burnt.json @@ -0,0 +1,625 @@ +{ + "ambientocclusion": false, + "textures": { + "ru_khaki_s21_b": "airdef:block/ru_khaki_s21_b", + "ru_khaki_s22_b": "airdef:block/ru_khaki_s22_b", + "radar_face_b": "airdef:block/radar_face_b", + "dark_metal_b": "airdef:block/dark_metal_b", + "tube_cap_b": "airdef:block/tube_cap_b", + "particle": "airdef:block/ru_khaki_s21_b" + }, + "elements": [ + { + "from": [ + -4.0, + 0.0, + -6.0 + ], + "to": [ + 20.0, + 16.0, + 22.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#ru_khaki_s21_b" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#ru_khaki_s21_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#ru_khaki_s21_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#ru_khaki_s21_b" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#ru_khaki_s22_b" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#ru_khaki_s22_b" + } + } + }, + { + "from": [ + -2.0, + 2.0, + -11.0 + ], + "to": [ + 18.0, + 15.0, + -6.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 13.0 + ], + "texture": "#radar_face_b" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 13.0 + ], + "texture": "#radar_face_b" + }, + "east": { + "uv": [ + 0, + 0, + 5.0, + 13.0 + ], + "texture": "#radar_face_b" + }, + "west": { + "uv": [ + 0, + 0, + 5.0, + 13.0 + ], + "texture": "#radar_face_b" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 5.0 + ], + "texture": "#radar_face_b" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 5.0 + ], + "texture": "#radar_face_b" + } + } + }, + { + "from": [ + -3.0, + 16.0, + 2.0 + ], + "to": [ + 19.0, + 17.0, + 20.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 1.0 + ], + "texture": "#dark_metal_b" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 1.0 + ], + "texture": "#dark_metal_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 1.0 + ], + "texture": "#dark_metal_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 1.0 + ], + "texture": "#dark_metal_b" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#dark_metal_b" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#dark_metal_b" + } + } + }, + { + "from": [ + -1.0, + 16.5, + 4.0 + ], + "to": [ + 3.0, + 17.5, + 10.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 4.0, + 1.0 + ], + "texture": "#tube_cap_b" + }, + "south": { + "uv": [ + 0, + 0, + 4.0, + 1.0 + ], + "texture": "#tube_cap_b" + }, + "east": { + "uv": [ + 0, + 0, + 6.0, + 1.0 + ], + "texture": "#tube_cap_b" + }, + "west": { + "uv": [ + 0, + 0, + 6.0, + 1.0 + ], + "texture": "#tube_cap_b" + }, + "up": { + "uv": [ + 0, + 0, + 4.0, + 6.0 + ], + "texture": "#tube_cap_b" + }, + "down": { + "uv": [ + 0, + 0, + 4.0, + 6.0 + ], + "texture": "#tube_cap_b" + } + } + }, + { + "from": [ + -1.0, + 16.5, + 12.0 + ], + "to": [ + 3.0, + 17.5, + 18.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 4.0, + 1.0 + ], + "texture": "#tube_cap_b" + }, + "south": { + "uv": [ + 0, + 0, + 4.0, + 1.0 + ], + "texture": "#tube_cap_b" + }, + "east": { + "uv": [ + 0, + 0, + 6.0, + 1.0 + ], + "texture": "#tube_cap_b" + }, + "west": { + "uv": [ + 0, + 0, + 6.0, + 1.0 + ], + "texture": "#tube_cap_b" + }, + "up": { + "uv": [ + 0, + 0, + 4.0, + 6.0 + ], + "texture": "#tube_cap_b" + }, + "down": { + "uv": [ + 0, + 0, + 4.0, + 6.0 + ], + "texture": "#tube_cap_b" + } + } + }, + { + "from": [ + 4.0, + 16.5, + 4.0 + ], + "to": [ + 8.0, + 17.5, + 10.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 4.0, + 1.0 + ], + "texture": "#tube_cap_b" + }, + "south": { + "uv": [ + 0, + 0, + 4.0, + 1.0 + ], + "texture": "#tube_cap_b" + }, + "east": { + "uv": [ + 0, + 0, + 6.0, + 1.0 + ], + "texture": "#tube_cap_b" + }, + "west": { + "uv": [ + 0, + 0, + 6.0, + 1.0 + ], + "texture": "#tube_cap_b" + }, + "up": { + "uv": [ + 0, + 0, + 4.0, + 6.0 + ], + "texture": "#tube_cap_b" + }, + "down": { + "uv": [ + 0, + 0, + 4.0, + 6.0 + ], + "texture": "#tube_cap_b" + } + } + }, + { + "from": [ + 4.0, + 16.5, + 12.0 + ], + "to": [ + 8.0, + 17.5, + 18.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 4.0, + 1.0 + ], + "texture": "#tube_cap_b" + }, + "south": { + "uv": [ + 0, + 0, + 4.0, + 1.0 + ], + "texture": "#tube_cap_b" + }, + "east": { + "uv": [ + 0, + 0, + 6.0, + 1.0 + ], + "texture": "#tube_cap_b" + }, + "west": { + "uv": [ + 0, + 0, + 6.0, + 1.0 + ], + "texture": "#tube_cap_b" + }, + "up": { + "uv": [ + 0, + 0, + 4.0, + 6.0 + ], + "texture": "#tube_cap_b" + }, + "down": { + "uv": [ + 0, + 0, + 4.0, + 6.0 + ], + "texture": "#tube_cap_b" + } + } + }, + { + "from": [ + 9.0, + 16.5, + 4.0 + ], + "to": [ + 13.0, + 17.5, + 10.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 4.0, + 1.0 + ], + "texture": "#tube_cap_b" + }, + "south": { + "uv": [ + 0, + 0, + 4.0, + 1.0 + ], + "texture": "#tube_cap_b" + }, + "east": { + "uv": [ + 0, + 0, + 6.0, + 1.0 + ], + "texture": "#tube_cap_b" + }, + "west": { + "uv": [ + 0, + 0, + 6.0, + 1.0 + ], + "texture": "#tube_cap_b" + }, + "up": { + "uv": [ + 0, + 0, + 4.0, + 6.0 + ], + "texture": "#tube_cap_b" + }, + "down": { + "uv": [ + 0, + 0, + 4.0, + 6.0 + ], + "texture": "#tube_cap_b" + } + } + }, + { + "from": [ + 14.0, + 16.5, + 4.0 + ], + "to": [ + 18.0, + 17.5, + 10.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 4.0, + 1.0 + ], + "texture": "#tube_cap_b" + }, + "south": { + "uv": [ + 0, + 0, + 4.0, + 1.0 + ], + "texture": "#tube_cap_b" + }, + "east": { + "uv": [ + 0, + 0, + 6.0, + 1.0 + ], + "texture": "#tube_cap_b" + }, + "west": { + "uv": [ + 0, + 0, + 6.0, + 1.0 + ], + "texture": "#tube_cap_b" + }, + "up": { + "uv": [ + 0, + 0, + 4.0, + 6.0 + ], + "texture": "#tube_cap_b" + }, + "down": { + "uv": [ + 0, + 0, + 4.0, + 6.0 + ], + "texture": "#tube_cap_b" + } + } + } + ] +} \ No newline at end of file diff --git a/airdef-mod/assets/airdef/models/block/tzm_truck.json b/airdef-mod/assets/airdef/models/block/tzm_truck.json index 44db33e..b911c51 100644 --- a/airdef-mod/assets/airdef/models/block/tzm_truck.json +++ b/airdef-mod/assets/airdef/models/block/tzm_truck.json @@ -1,14 +1,18 @@ { "ambientocclusion": false, "textures": { + "ru_green_s21": "airdef:block/ru_green_s21", + "ru_green_s31": "airdef:block/ru_green_s31", + "ru_green_s23": "airdef:block/ru_green_s23", + "glass_cab": "airdef:block/glass_cab", "ru_green": "airdef:block/ru_green", - "glass": "airdef:block/glass", "dark_metal": "airdef:block/dark_metal", - "tube": "airdef:block/tube", "tube_cap": "airdef:block/tube_cap", + "tube": "airdef:block/tube", "metal": "airdef:block/metal", "tire": "airdef:block/tire", - "particle": "airdef:block/ru_green" + "hub": "airdef:block/hub", + "particle": "airdef:block/ru_green_s21" }, "elements": [ { @@ -30,7 +34,7 @@ 16, 4.0 ], - "texture": "#ru_green" + "texture": "#ru_green_s21" }, "south": { "uv": [ @@ -39,7 +43,7 @@ 16, 4.0 ], - "texture": "#ru_green" + "texture": "#ru_green_s21" }, "east": { "uv": [ @@ -48,7 +52,7 @@ 16, 4.0 ], - "texture": "#ru_green" + "texture": "#ru_green_s31" }, "west": { "uv": [ @@ -57,7 +61,7 @@ 16, 4.0 ], - "texture": "#ru_green" + "texture": "#ru_green_s31" }, "up": { "uv": [ @@ -66,7 +70,7 @@ 16, 16 ], - "texture": "#ru_green" + "texture": "#ru_green_s23" }, "down": { "uv": [ @@ -75,7 +79,7 @@ 16, 16 ], - "texture": "#ru_green" + "texture": "#ru_green_s23" } } }, @@ -98,7 +102,7 @@ 16, 11.0 ], - "texture": "#glass" + "texture": "#glass_cab" }, "south": { "uv": [ @@ -107,7 +111,7 @@ 16, 11.0 ], - "texture": "#ru_green" + "texture": "#ru_green_s21" }, "east": { "uv": [ @@ -134,7 +138,7 @@ 16, 10.0 ], - "texture": "#ru_green" + "texture": "#ru_green_s21" }, "down": { "uv": [ @@ -143,7 +147,7 @@ 16, 10.0 ], - "texture": "#ru_green" + "texture": "#ru_green_s21" } } }, @@ -558,13 +562,13 @@ { "from": [ -9.0, - 0.0, - -12.0 + 0.3424499999999995, + -12.65755 ], "to": [ -5.5, - 9.0, - -5.0 + 8.65755, + -4.3424499999999995 ], "faces": { "north": { @@ -572,7 +576,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -581,7 +585,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -589,26 +593,26 @@ "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -617,7 +621,7 @@ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" } @@ -626,13 +630,13 @@ { "from": [ 21.5, - 0.0, - -12.0 + 0.3424499999999995, + -12.65755 ], "to": [ 25.0, - 9.0, - -5.0 + 8.65755, + -4.3424499999999995 ], "faces": { "north": { @@ -640,7 +644,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -649,7 +653,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -657,26 +661,26 @@ "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -685,22 +689,176 @@ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" } } }, + { + "from": [ + -8.97, + 0.3424499999999995, + -12.65755 + ], + "to": [ + -5.53, + 8.65755, + -4.3424499999999995 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -7.25, + 4.5, + -8.5 + ] + } + }, + { + "from": [ + 21.53, + 0.3424499999999995, + -12.65755 + ], + "to": [ + 24.97, + 8.65755, + -4.3424499999999995 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 23.25, + 4.5, + -8.5 + ] + } + }, { "from": [ -9.0, - 0.0, - -3.0 + 0.3424499999999995, + -3.6575500000000005 ], "to": [ -5.5, - 9.0, - 4.0 + 8.65755, + 4.6575500000000005 ], "faces": { "north": { @@ -708,7 +866,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -717,7 +875,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -725,26 +883,26 @@ "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -753,7 +911,7 @@ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" } @@ -762,13 +920,13 @@ { "from": [ 21.5, - 0.0, - -3.0 + 0.3424499999999995, + -3.6575500000000005 ], "to": [ 25.0, - 9.0, - 4.0 + 8.65755, + 4.6575500000000005 ], "faces": { "north": { @@ -776,7 +934,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -785,7 +943,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -793,26 +951,26 @@ "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -821,22 +979,176 @@ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" } } }, + { + "from": [ + -8.97, + 0.3424499999999995, + -3.6575500000000005 + ], + "to": [ + -5.53, + 8.65755, + 4.6575500000000005 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -7.25, + 4.5, + 0.5 + ] + } + }, + { + "from": [ + 21.53, + 0.3424499999999995, + -3.6575500000000005 + ], + "to": [ + 24.97, + 8.65755, + 4.6575500000000005 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 23.25, + 4.5, + 0.5 + ] + } + }, { "from": [ -9.0, - 0.0, - 16.0 + 0.3424499999999995, + 15.34245 ], "to": [ -5.5, - 9.0, - 23.0 + 8.65755, + 23.65755 ], "faces": { "north": { @@ -844,7 +1156,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -853,7 +1165,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -861,26 +1173,26 @@ "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -889,7 +1201,7 @@ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" } @@ -898,13 +1210,13 @@ { "from": [ 21.5, - 0.0, - 16.0 + 0.3424499999999995, + 15.34245 ], "to": [ 25.0, - 9.0, - 23.0 + 8.65755, + 23.65755 ], "faces": { "north": { @@ -912,7 +1224,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -921,7 +1233,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -929,26 +1241,26 @@ "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -957,22 +1269,176 @@ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" } } }, + { + "from": [ + -8.97, + 0.3424499999999995, + 15.34245 + ], + "to": [ + -5.53, + 8.65755, + 23.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -7.25, + 4.5, + 19.5 + ] + } + }, + { + "from": [ + 21.53, + 0.3424499999999995, + 15.34245 + ], + "to": [ + 24.97, + 8.65755, + 23.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 23.25, + 4.5, + 19.5 + ] + } + }, { "from": [ -9.0, - 0.0, - 24.0 + 0.3424499999999995, + 23.34245 ], "to": [ -5.5, - 9.0, - 31.0 + 8.65755, + 31.65755 ], "faces": { "north": { @@ -980,7 +1446,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -989,7 +1455,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -997,26 +1463,26 @@ "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -1025,7 +1491,7 @@ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" } @@ -1034,13 +1500,13 @@ { "from": [ 21.5, - 0.0, - 24.0 + 0.3424499999999995, + 23.34245 ], "to": [ 25.0, - 9.0, - 31.0 + 8.65755, + 31.65755 ], "faces": { "north": { @@ -1048,7 +1514,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -1057,7 +1523,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -1065,26 +1531,26 @@ "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -1093,11 +1559,165 @@ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" } } + }, + { + "from": [ + -8.97, + 0.3424499999999995, + 23.34245 + ], + "to": [ + -5.53, + 8.65755, + 31.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -7.25, + 4.5, + 27.5 + ] + } + }, + { + "from": [ + 21.53, + 0.3424499999999995, + 23.34245 + ], + "to": [ + 24.97, + 8.65755, + 31.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 23.25, + 4.5, + 27.5 + ] + } } ] } \ No newline at end of file diff --git a/airdef-mod/assets/airdef/models/block/tzm_truck_burnt.json b/airdef-mod/assets/airdef/models/block/tzm_truck_burnt.json new file mode 100644 index 0000000..cc6cb33 --- /dev/null +++ b/airdef-mod/assets/airdef/models/block/tzm_truck_burnt.json @@ -0,0 +1,1723 @@ +{ + "ambientocclusion": false, + "textures": { + "ru_green_s21_b": "airdef:block/ru_green_s21_b", + "ru_green_s31_b": "airdef:block/ru_green_s31_b", + "ru_green_s23_b": "airdef:block/ru_green_s23_b", + "glass_cab_b": "airdef:block/glass_cab_b", + "ru_green_b": "airdef:block/ru_green_b", + "dark_metal_b": "airdef:block/dark_metal_b", + "tube_cap_b": "airdef:block/tube_cap_b", + "tube_b": "airdef:block/tube_b", + "metal_b": "airdef:block/metal_b", + "tire_b": "airdef:block/tire_b", + "hub_b": "airdef:block/hub_b", + "particle": "airdef:block/ru_green_s21_b" + }, + "elements": [ + { + "from": [ + -6.0, + 5.0, + -16.0 + ], + "to": [ + 22.0, + 9.0, + 32.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#ru_green_s21_b" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#ru_green_s21_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#ru_green_s31_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#ru_green_s31_b" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#ru_green_s23_b" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#ru_green_s23_b" + } + } + }, + { + "from": [ + -6.0, + 9.0, + -16.0 + ], + "to": [ + 22.0, + 20.0, + -6.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 11.0 + ], + "texture": "#glass_cab_b" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 11.0 + ], + "texture": "#ru_green_s21_b" + }, + "east": { + "uv": [ + 0, + 0, + 10.0, + 11.0 + ], + "texture": "#ru_green_b" + }, + "west": { + "uv": [ + 0, + 0, + 10.0, + 11.0 + ], + "texture": "#ru_green_b" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 10.0 + ], + "texture": "#ru_green_s21_b" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 10.0 + ], + "texture": "#ru_green_s21_b" + } + } + }, + { + "from": [ + -4.0, + 9.0, + -2.0 + ], + "to": [ + 20.0, + 12.0, + 30.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 3.0 + ], + "texture": "#dark_metal_b" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 3.0 + ], + "texture": "#dark_metal_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 3.0 + ], + "texture": "#dark_metal_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 3.0 + ], + "texture": "#dark_metal_b" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#dark_metal_b" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#dark_metal_b" + } + } + }, + { + "from": [ + -3.0, + 12.0, + -1.0 + ], + "to": [ + 3.0, + 18.0, + 29.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 6.0, + 6.0 + ], + "texture": "#tube_cap_b" + }, + "south": { + "uv": [ + 0, + 0, + 6.0, + 6.0 + ], + "texture": "#tube_cap_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 6.0 + ], + "texture": "#tube_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 6.0 + ], + "texture": "#tube_b" + }, + "up": { + "uv": [ + 0, + 0, + 6.0, + 16 + ], + "texture": "#tube_b" + }, + "down": { + "uv": [ + 0, + 0, + 6.0, + 16 + ], + "texture": "#tube_b" + } + } + }, + { + "from": [ + 5.0, + 12.0, + -1.0 + ], + "to": [ + 11.0, + 18.0, + 29.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 6.0, + 6.0 + ], + "texture": "#tube_cap_b" + }, + "south": { + "uv": [ + 0, + 0, + 6.0, + 6.0 + ], + "texture": "#tube_cap_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 6.0 + ], + "texture": "#tube_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 6.0 + ], + "texture": "#tube_b" + }, + "up": { + "uv": [ + 0, + 0, + 6.0, + 16 + ], + "texture": "#tube_b" + }, + "down": { + "uv": [ + 0, + 0, + 6.0, + 16 + ], + "texture": "#tube_b" + } + } + }, + { + "from": [ + 13.0, + 12.0, + -1.0 + ], + "to": [ + 19.0, + 18.0, + 29.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 6.0, + 6.0 + ], + "texture": "#tube_cap_b" + }, + "south": { + "uv": [ + 0, + 0, + 6.0, + 6.0 + ], + "texture": "#tube_cap_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 6.0 + ], + "texture": "#tube_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 6.0 + ], + "texture": "#tube_b" + }, + "up": { + "uv": [ + 0, + 0, + 6.0, + 16 + ], + "texture": "#tube_b" + }, + "down": { + "uv": [ + 0, + 0, + 6.0, + 16 + ], + "texture": "#tube_b" + } + } + }, + { + "from": [ + 18.0, + 12.0, + -4.0 + ], + "to": [ + 21.0, + 26.0, + -1.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.0, + 14.0 + ], + "texture": "#metal_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.0, + 14.0 + ], + "texture": "#metal_b" + }, + "east": { + "uv": [ + 0, + 0, + 3.0, + 14.0 + ], + "texture": "#metal_b" + }, + "west": { + "uv": [ + 0, + 0, + 3.0, + 14.0 + ], + "texture": "#metal_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.0, + 3.0 + ], + "texture": "#metal_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.0, + 3.0 + ], + "texture": "#metal_b" + } + } + }, + { + "from": [ + 6.0, + 24.0, + -4.0 + ], + "to": [ + 21.0, + 26.0, + -1.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 15.0, + 2.0 + ], + "texture": "#metal_b" + }, + "south": { + "uv": [ + 0, + 0, + 15.0, + 2.0 + ], + "texture": "#metal_b" + }, + "east": { + "uv": [ + 0, + 0, + 3.0, + 2.0 + ], + "texture": "#metal_b" + }, + "west": { + "uv": [ + 0, + 0, + 3.0, + 2.0 + ], + "texture": "#metal_b" + }, + "up": { + "uv": [ + 0, + 0, + 15.0, + 3.0 + ], + "texture": "#metal_b" + }, + "down": { + "uv": [ + 0, + 0, + 15.0, + 3.0 + ], + "texture": "#metal_b" + } + } + }, + { + "from": [ + -9.0, + 0.3424499999999995, + -12.65755 + ], + "to": [ + -5.5, + 8.65755, + -4.3424499999999995 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + } + } + }, + { + "from": [ + 21.5, + 0.3424499999999995, + -12.65755 + ], + "to": [ + 25.0, + 8.65755, + -4.3424499999999995 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + } + } + }, + { + "from": [ + -8.97, + 0.3424499999999995, + -12.65755 + ], + "to": [ + -5.53, + 8.65755, + -4.3424499999999995 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -7.25, + 4.5, + -8.5 + ] + } + }, + { + "from": [ + 21.53, + 0.3424499999999995, + -12.65755 + ], + "to": [ + 24.97, + 8.65755, + -4.3424499999999995 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 23.25, + 4.5, + -8.5 + ] + } + }, + { + "from": [ + -9.0, + 0.3424499999999995, + -3.6575500000000005 + ], + "to": [ + -5.5, + 8.65755, + 4.6575500000000005 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + } + } + }, + { + "from": [ + 21.5, + 0.3424499999999995, + -3.6575500000000005 + ], + "to": [ + 25.0, + 8.65755, + 4.6575500000000005 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + } + } + }, + { + "from": [ + -8.97, + 0.3424499999999995, + -3.6575500000000005 + ], + "to": [ + -5.53, + 8.65755, + 4.6575500000000005 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -7.25, + 4.5, + 0.5 + ] + } + }, + { + "from": [ + 21.53, + 0.3424499999999995, + -3.6575500000000005 + ], + "to": [ + 24.97, + 8.65755, + 4.6575500000000005 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 23.25, + 4.5, + 0.5 + ] + } + }, + { + "from": [ + -9.0, + 0.3424499999999995, + 15.34245 + ], + "to": [ + -5.5, + 8.65755, + 23.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + } + } + }, + { + "from": [ + 21.5, + 0.3424499999999995, + 15.34245 + ], + "to": [ + 25.0, + 8.65755, + 23.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + } + } + }, + { + "from": [ + -8.97, + 0.3424499999999995, + 15.34245 + ], + "to": [ + -5.53, + 8.65755, + 23.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -7.25, + 4.5, + 19.5 + ] + } + }, + { + "from": [ + 21.53, + 0.3424499999999995, + 15.34245 + ], + "to": [ + 24.97, + 8.65755, + 23.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 23.25, + 4.5, + 19.5 + ] + } + }, + { + "from": [ + -9.0, + 0.3424499999999995, + 23.34245 + ], + "to": [ + -5.5, + 8.65755, + 31.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + } + } + }, + { + "from": [ + 21.5, + 0.3424499999999995, + 23.34245 + ], + "to": [ + 25.0, + 8.65755, + 31.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + } + } + }, + { + "from": [ + -8.97, + 0.3424499999999995, + 23.34245 + ], + "to": [ + -5.53, + 8.65755, + 31.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -7.25, + 4.5, + 27.5 + ] + } + }, + { + "from": [ + 21.53, + 0.3424499999999995, + 23.34245 + ], + "to": [ + 24.97, + 8.65755, + 31.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 23.25, + 4.5, + 27.5 + ] + } + } + ] +} \ No newline at end of file diff --git a/airdef-mod/assets/airdef/models/block/zircon.json b/airdef-mod/assets/airdef/models/block/zircon.json index 7fe2b57..970c1ed 100644 --- a/airdef-mod/assets/airdef/models/block/zircon.json +++ b/airdef-mod/assets/airdef/models/block/zircon.json @@ -1,22 +1,23 @@ { "ambientocclusion": false, "textures": { + "rm_dark": "airdef:block/rm_dark", + "rm_dark_t": "airdef:block/rm_dark_t", + "bare_nozzle": "airdef:block/bare_nozzle", "dark_metal": "airdef:block/dark_metal", - "kh101": "airdef:block/kh101", - "intake": "airdef:block/intake", - "nozzle": "airdef:block/nozzle", - "particle": "airdef:block/dark_metal" + "glow_ember": "airdef:block/glow_ember", + "particle": "airdef:block/rm_dark" }, "elements": [ { "from": [ - 7.25, - 7.3125, + 7.078979616509515, + 7.078979616509515, -16.0 ], "to": [ - 8.75, - 8.6875, + 8.921020383490486, + 8.921020383490486, -13.5 ], "faces": { @@ -24,67 +25,144 @@ "uv": [ 0, 0, - 1.5, - 1.375 + 1.842040766980971, + 1.842040766980971 ], - "texture": "#dark_metal" + "texture": "#rm_dark" }, "south": { "uv": [ 0, 0, - 1.5, - 1.375 + 1.842040766980971, + 1.842040766980971 ], - "texture": "#dark_metal" + "texture": "#rm_dark" }, "east": { "uv": [ 0, 0, 2.5, - 1.375 + 1.842040766980971 ], - "texture": "#dark_metal" + "texture": "#rm_dark" }, "west": { "uv": [ 0, 0, 2.5, - 1.375 + 1.842040766980971 ], - "texture": "#dark_metal" + "texture": "#rm_dark" }, "up": { "uv": [ 0, 0, - 1.5, + 1.842040766980971, 2.5 ], - "texture": "#dark_metal" + "texture": "#rm_dark_t" }, "down": { "uv": [ 0, 0, - 1.5, + 1.842040766980971, 2.5 ], - "texture": "#dark_metal" + "texture": "#rm_dark_t" } } }, { "from": [ - 6.75, - 6.9375, + 7.078979616509515, + 7.078979616509515, + -15.97 + ], + "to": [ + 8.921020383490486, + 8.921020383490486, + -13.53 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 1.842040766980971, + 1.842040766980971 + ], + "texture": "#rm_dark" + }, + "south": { + "uv": [ + 0, + 0, + 1.842040766980971, + 1.842040766980971 + ], + "texture": "#rm_dark" + }, + "east": { + "uv": [ + 0, + 0, + 2.4400000000000013, + 1.842040766980971 + ], + "texture": "#rm_dark" + }, + "west": { + "uv": [ + 0, + 0, + 2.4400000000000013, + 1.842040766980971 + ], + "texture": "#rm_dark" + }, + "up": { + "uv": [ + 0, + 0, + 1.842040766980971, + 2.4400000000000013 + ], + "texture": "#rm_dark_t" + }, + "down": { + "uv": [ + 0, + 0, + 1.842040766980971, + 2.4400000000000013 + ], + "texture": "#rm_dark_t" + } + }, + "rotation": { + "angle": 45, + "axis": "z", + "origin": [ + 8.0, + 8.0, + -14.75 + ] + } + }, + { + "from": [ + 6.499582134683867, + 6.499582134683867, -13.5 ], "to": [ - 9.25, - 9.0625, + 9.500417865316132, + 9.500417865316132, -11.0 ], "faces": { @@ -92,67 +170,144 @@ "uv": [ 0, 0, - 2.5, - 2.125 + 3.0008357306322653, + 3.0008357306322653 ], - "texture": "#dark_metal" + "texture": "#rm_dark" }, "south": { "uv": [ 0, 0, - 2.5, - 2.125 + 3.0008357306322653, + 3.0008357306322653 ], - "texture": "#dark_metal" + "texture": "#rm_dark" }, "east": { "uv": [ 0, 0, 2.5, - 2.125 + 3.0008357306322653 ], - "texture": "#dark_metal" + "texture": "#rm_dark" }, "west": { "uv": [ 0, 0, 2.5, - 2.125 + 3.0008357306322653 ], - "texture": "#dark_metal" + "texture": "#rm_dark" }, "up": { "uv": [ 0, 0, - 2.5, + 3.0008357306322653, 2.5 ], - "texture": "#dark_metal" + "texture": "#rm_dark_t" }, "down": { "uv": [ 0, 0, - 2.5, + 3.0008357306322653, 2.5 ], - "texture": "#dark_metal" + "texture": "#rm_dark_t" } } }, { "from": [ - 6.25, - 6.5625, + 6.499582134683867, + 6.499582134683867, + -13.47 + ], + "to": [ + 9.500417865316132, + 9.500417865316132, + -11.03 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.0008357306322653, + 3.0008357306322653 + ], + "texture": "#rm_dark" + }, + "south": { + "uv": [ + 0, + 0, + 3.0008357306322653, + 3.0008357306322653 + ], + "texture": "#rm_dark" + }, + "east": { + "uv": [ + 0, + 0, + 2.4400000000000013, + 3.0008357306322653 + ], + "texture": "#rm_dark" + }, + "west": { + "uv": [ + 0, + 0, + 2.4400000000000013, + 3.0008357306322653 + ], + "texture": "#rm_dark" + }, + "up": { + "uv": [ + 0, + 0, + 3.0008357306322653, + 2.4400000000000013 + ], + "texture": "#rm_dark_t" + }, + "down": { + "uv": [ + 0, + 0, + 3.0008357306322653, + 2.4400000000000013 + ], + "texture": "#rm_dark_t" + } + }, + "rotation": { + "angle": 45, + "axis": "z", + "origin": [ + 8.0, + 8.0, + -12.25 + ] + } + }, + { + "from": [ + 6.064846632053114, + 6.064846632053114, -11.0 ], "to": [ - 9.75, - 9.4375, + 9.935153367946887, + 9.935153367946887, -8.5 ], "faces": { @@ -160,67 +315,144 @@ "uv": [ 0, 0, - 3.5, - 2.875 + 3.870306735893773, + 3.870306735893773 ], - "texture": "#dark_metal" + "texture": "#rm_dark" }, "south": { "uv": [ 0, 0, - 3.5, - 2.875 + 3.870306735893773, + 3.870306735893773 ], - "texture": "#dark_metal" + "texture": "#rm_dark" }, "east": { "uv": [ 0, 0, 2.5, - 2.875 + 3.870306735893773 ], - "texture": "#dark_metal" + "texture": "#rm_dark" }, "west": { "uv": [ 0, 0, 2.5, - 2.875 + 3.870306735893773 ], - "texture": "#dark_metal" + "texture": "#rm_dark" }, "up": { "uv": [ 0, 0, - 3.5, + 3.870306735893773, 2.5 ], - "texture": "#dark_metal" + "texture": "#rm_dark_t" }, "down": { "uv": [ 0, 0, - 3.5, + 3.870306735893773, 2.5 ], - "texture": "#dark_metal" + "texture": "#rm_dark_t" } } }, { "from": [ - 5.75, - 6.1875, + 6.064846632053114, + 6.064846632053114, + -10.97 + ], + "to": [ + 9.935153367946887, + 9.935153367946887, + -8.53 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.870306735893773, + 3.870306735893773 + ], + "texture": "#rm_dark" + }, + "south": { + "uv": [ + 0, + 0, + 3.870306735893773, + 3.870306735893773 + ], + "texture": "#rm_dark" + }, + "east": { + "uv": [ + 0, + 0, + 2.4400000000000013, + 3.870306735893773 + ], + "texture": "#rm_dark" + }, + "west": { + "uv": [ + 0, + 0, + 2.4400000000000013, + 3.870306735893773 + ], + "texture": "#rm_dark" + }, + "up": { + "uv": [ + 0, + 0, + 3.870306735893773, + 2.4400000000000013 + ], + "texture": "#rm_dark_t" + }, + "down": { + "uv": [ + 0, + 0, + 3.870306735893773, + 2.4400000000000013 + ], + "texture": "#rm_dark_t" + } + }, + "rotation": { + "angle": 45, + "axis": "z", + "origin": [ + 8.0, + 8.0, + -9.75 + ] + } + }, + { + "from": [ + 5.698683940868628, + 5.698683940868628, -8.5 ], "to": [ - 10.25, - 9.8125, + 10.301316059131372, + 10.301316059131372, -6.0 ], "faces": { @@ -228,135 +460,289 @@ "uv": [ 0, 0, - 4.5, - 3.625 + 4.602632118262743, + 4.602632118262743 ], - "texture": "#dark_metal" + "texture": "#rm_dark" }, "south": { "uv": [ 0, 0, - 4.5, - 3.625 + 4.602632118262743, + 4.602632118262743 ], - "texture": "#dark_metal" + "texture": "#rm_dark" }, "east": { "uv": [ 0, 0, 2.5, - 3.625 + 4.602632118262743 ], - "texture": "#dark_metal" + "texture": "#rm_dark" }, "west": { "uv": [ 0, 0, 2.5, - 3.625 + 4.602632118262743 ], - "texture": "#dark_metal" + "texture": "#rm_dark" }, "up": { "uv": [ 0, 0, - 4.5, + 4.602632118262743, 2.5 ], - "texture": "#dark_metal" + "texture": "#rm_dark_t" }, "down": { "uv": [ 0, 0, - 4.5, + 4.602632118262743, 2.5 ], - "texture": "#dark_metal" + "texture": "#rm_dark_t" } } }, { "from": [ - 5.5, - 6.0, + 5.698683940868628, + 5.698683940868628, + -8.47 + ], + "to": [ + 10.301316059131372, + 10.301316059131372, + -6.03 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 4.602632118262743, + 4.602632118262743 + ], + "texture": "#rm_dark" + }, + "south": { + "uv": [ + 0, + 0, + 4.602632118262743, + 4.602632118262743 + ], + "texture": "#rm_dark" + }, + "east": { + "uv": [ + 0, + 0, + 2.4400000000000004, + 4.602632118262743 + ], + "texture": "#rm_dark" + }, + "west": { + "uv": [ + 0, + 0, + 2.4400000000000004, + 4.602632118262743 + ], + "texture": "#rm_dark" + }, + "up": { + "uv": [ + 0, + 0, + 4.602632118262743, + 2.4400000000000004 + ], + "texture": "#rm_dark_t" + }, + "down": { + "uv": [ + 0, + 0, + 4.602632118262743, + 2.4400000000000004 + ], + "texture": "#rm_dark_t" + } + }, + "rotation": { + "angle": 45, + "axis": "z", + "origin": [ + 8.0, + 8.0, + -7.25 + ] + } + }, + { + "from": [ + 5.59786, + 5.59786, -6.0 ], "to": [ - 10.5, - 10.0, - 30.0 + 10.40214, + 10.40214, + 28.0 ], "faces": { "north": { "uv": [ 0, 0, - 5.0, - 4.0 + 4.804279999999999, + 4.804279999999999 ], - "texture": "#kh101" + "texture": "#rm_dark" }, "south": { "uv": [ 0, 0, - 5.0, - 4.0 + 4.804279999999999, + 4.804279999999999 ], - "texture": "#kh101" + "texture": "#rm_dark" }, "east": { "uv": [ 0, 0, 16, - 4.0 + 4.804279999999999 ], - "texture": "#kh101" + "texture": "#rm_dark" }, "west": { "uv": [ 0, 0, 16, - 4.0 + 4.804279999999999 ], - "texture": "#kh101" + "texture": "#rm_dark" }, "up": { "uv": [ 0, 0, - 5.0, + 4.804279999999999, 16 ], - "texture": "#kh101" + "texture": "#rm_dark_t" }, "down": { "uv": [ 0, 0, - 5.0, + 4.804279999999999, 16 ], - "texture": "#kh101" + "texture": "#rm_dark_t" } } }, { "from": [ - 6.0, - 3.5, + 5.59786, + 5.59786, + -5.97 + ], + "to": [ + 10.40214, + 10.40214, + 27.97 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 4.804279999999999, + 4.804279999999999 + ], + "texture": "#rm_dark" + }, + "south": { + "uv": [ + 0, + 0, + 4.804279999999999, + 4.804279999999999 + ], + "texture": "#rm_dark" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 4.804279999999999 + ], + "texture": "#rm_dark" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 4.804279999999999 + ], + "texture": "#rm_dark" + }, + "up": { + "uv": [ + 0, + 0, + 4.804279999999999, + 16 + ], + "texture": "#rm_dark_t" + }, + "down": { + "uv": [ + 0, + 0, + 4.804279999999999, + 16 + ], + "texture": "#rm_dark_t" + } + }, + "rotation": { + "angle": 45, + "axis": "z", + "origin": [ + 8.0, + 8.0, + 11.0 + ] + } + }, + { + "from": [ + 6.2, + 3.4, 0.0 ], "to": [ - 10.0, - 6.0, + 9.8, + 5.2, 24.0 ], "faces": { @@ -364,327 +750,735 @@ "uv": [ 0, 0, - 4.0, - 2.5 + 3.6000000000000005, + 1.8000000000000003 ], - "texture": "#intake" + "texture": "#bare_nozzle" }, "south": { "uv": [ 0, 0, - 4.0, - 2.5 + 3.6000000000000005, + 1.8000000000000003 ], - "texture": "#intake" + "texture": "#bare_nozzle" }, "east": { "uv": [ 0, 0, 16, - 2.5 + 1.8000000000000003 ], - "texture": "#intake" + "texture": "#bare_nozzle" }, "west": { "uv": [ 0, 0, 16, - 2.5 + 1.8000000000000003 ], - "texture": "#intake" + "texture": "#bare_nozzle" }, "up": { "uv": [ 0, 0, - 4.0, + 3.6000000000000005, 16 ], - "texture": "#intake" + "texture": "#bare_nozzle" }, "down": { "uv": [ 0, 0, - 4.0, + 3.6000000000000005, 16 ], - "texture": "#intake" + "texture": "#bare_nozzle" } } }, { "from": [ - 5.5, - 6.0, - 30.0 - ], - "to": [ - 10.5, - 10.0, - 32.0 - ], - "faces": { - "north": { - "uv": [ - 0, - 0, - 5.0, - 4.0 - ], - "texture": "#nozzle" - }, - "south": { - "uv": [ - 0, - 0, - 5.0, - 4.0 - ], - "texture": "#nozzle" - }, - "east": { - "uv": [ - 0, - 0, - 2.0, - 4.0 - ], - "texture": "#nozzle" - }, - "west": { - "uv": [ - 0, - 0, - 2.0, - 4.0 - ], - "texture": "#nozzle" - }, - "up": { - "uv": [ - 0, - 0, - 5.0, - 2.0 - ], - "texture": "#nozzle" - }, - "down": { - "uv": [ - 0, - 0, - 5.0, - 2.0 - ], - "texture": "#nozzle" - } - } - }, - { - "from": [ - 1.0, - 7.6, + 10.34, + 7.65, 22.0 ], "to": [ - 5.5, - 8.4, - 30.0 + 13.365, + 8.35, + 28.0 ], "faces": { "north": { "uv": [ 0, 0, - 4.5, - 0.8000000000000007 + 3.0250000000000004, + 0.6999999999999993 ], - "texture": "#kh101" + "texture": "#dark_metal" }, "south": { "uv": [ 0, 0, - 4.5, - 0.8000000000000007 + 3.0250000000000004, + 0.6999999999999993 ], - "texture": "#kh101" + "texture": "#dark_metal" }, "east": { "uv": [ 0, 0, - 8.0, - 0.8000000000000007 + 6.0, + 0.6999999999999993 ], - "texture": "#kh101" + "texture": "#dark_metal" }, "west": { "uv": [ 0, 0, - 8.0, - 0.8000000000000007 + 6.0, + 0.6999999999999993 ], - "texture": "#kh101" + "texture": "#dark_metal" }, "up": { "uv": [ 0, 0, - 4.5, - 8.0 + 3.0250000000000004, + 6.0 ], - "texture": "#kh101" + "texture": "#dark_metal" }, "down": { "uv": [ 0, 0, - 4.5, - 8.0 + 3.0250000000000004, + 6.0 ], - "texture": "#kh101" + "texture": "#dark_metal" } } }, { "from": [ - 10.5, - 7.6, + 2.635, + 7.65, 22.0 ], "to": [ - 15.0, - 8.4, - 30.0 + 5.66, + 8.35, + 28.0 ], "faces": { "north": { "uv": [ 0, 0, - 4.5, - 0.8000000000000007 + 3.0250000000000004, + 0.6999999999999993 ], - "texture": "#kh101" + "texture": "#dark_metal" }, "south": { "uv": [ 0, 0, - 4.5, - 0.8000000000000007 + 3.0250000000000004, + 0.6999999999999993 ], - "texture": "#kh101" + "texture": "#dark_metal" }, "east": { "uv": [ 0, 0, - 8.0, - 0.8000000000000007 + 6.0, + 0.6999999999999993 ], - "texture": "#kh101" + "texture": "#dark_metal" }, "west": { "uv": [ 0, 0, - 8.0, - 0.8000000000000007 + 6.0, + 0.6999999999999993 ], - "texture": "#kh101" + "texture": "#dark_metal" }, "up": { "uv": [ 0, 0, - 4.5, - 8.0 + 3.0250000000000004, + 6.0 ], - "texture": "#kh101" + "texture": "#dark_metal" }, "down": { "uv": [ 0, 0, - 4.5, - 8.0 + 3.0250000000000004, + 6.0 ], - "texture": "#kh101" + "texture": "#dark_metal" } } }, { "from": [ - 7.6, - 10.0, - 22.0 + 13.365, + 7.65, + 25.0 ], "to": [ - 8.4, - 14.0, - 30.0 + 15.84, + 8.35, + 28.0 ], "faces": { "north": { "uv": [ 0, 0, - 0.8000000000000007, - 4.0 + 2.4749999999999996, + 0.6999999999999993 ], - "texture": "#kh101" + "texture": "#dark_metal" }, "south": { "uv": [ 0, 0, - 0.8000000000000007, - 4.0 + 2.4749999999999996, + 0.6999999999999993 ], - "texture": "#kh101" + "texture": "#dark_metal" }, "east": { "uv": [ 0, 0, - 8.0, - 4.0 + 3.0, + 0.6999999999999993 ], - "texture": "#kh101" + "texture": "#dark_metal" }, "west": { "uv": [ 0, 0, - 8.0, - 4.0 + 3.0, + 0.6999999999999993 ], - "texture": "#kh101" + "texture": "#dark_metal" }, "up": { "uv": [ 0, 0, - 0.8000000000000007, - 8.0 + 2.4749999999999996, + 3.0 ], - "texture": "#kh101" + "texture": "#dark_metal" }, "down": { "uv": [ 0, 0, - 0.8000000000000007, - 8.0 + 2.4749999999999996, + 3.0 ], - "texture": "#kh101" + "texture": "#dark_metal" + } + } + }, + { + "from": [ + 0.16000000000000014, + 7.65, + 25.0 + ], + "to": [ + 2.635, + 8.35, + 28.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 2.4749999999999996, + 0.6999999999999993 + ], + "texture": "#dark_metal" + }, + "south": { + "uv": [ + 0, + 0, + 2.4749999999999996, + 0.6999999999999993 + ], + "texture": "#dark_metal" + }, + "east": { + "uv": [ + 0, + 0, + 3.0, + 0.6999999999999993 + ], + "texture": "#dark_metal" + }, + "west": { + "uv": [ + 0, + 0, + 3.0, + 0.6999999999999993 + ], + "texture": "#dark_metal" + }, + "up": { + "uv": [ + 0, + 0, + 2.4749999999999996, + 3.0 + ], + "texture": "#dark_metal" + }, + "down": { + "uv": [ + 0, + 0, + 2.4749999999999996, + 3.0 + ], + "texture": "#dark_metal" + } + } + }, + { + "from": [ + 7.65, + 10.34, + 22.0 + ], + "to": [ + 8.35, + 13.365, + 28.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 3.0250000000000004 + ], + "texture": "#dark_metal" + }, + "south": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 3.0250000000000004 + ], + "texture": "#dark_metal" + }, + "east": { + "uv": [ + 0, + 0, + 6.0, + 3.0250000000000004 + ], + "texture": "#dark_metal" + }, + "west": { + "uv": [ + 0, + 0, + 6.0, + 3.0250000000000004 + ], + "texture": "#dark_metal" + }, + "up": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 6.0 + ], + "texture": "#dark_metal" + }, + "down": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 6.0 + ], + "texture": "#dark_metal" + } + } + }, + { + "from": [ + 7.65, + 13.365, + 25.0 + ], + "to": [ + 8.35, + 15.84, + 28.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 2.4749999999999996 + ], + "texture": "#dark_metal" + }, + "south": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 2.4749999999999996 + ], + "texture": "#dark_metal" + }, + "east": { + "uv": [ + 0, + 0, + 3.0, + 2.4749999999999996 + ], + "texture": "#dark_metal" + }, + "west": { + "uv": [ + 0, + 0, + 3.0, + 2.4749999999999996 + ], + "texture": "#dark_metal" + }, + "up": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 3.0 + ], + "texture": "#dark_metal" + }, + "down": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 3.0 + ], + "texture": "#dark_metal" + } + } + }, + { + "from": [ + 7.65, + 2.635, + 22.0 + ], + "to": [ + 8.35, + 5.66, + 28.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 3.0250000000000004 + ], + "texture": "#dark_metal" + }, + "south": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 3.0250000000000004 + ], + "texture": "#dark_metal" + }, + "east": { + "uv": [ + 0, + 0, + 6.0, + 3.0250000000000004 + ], + "texture": "#dark_metal" + }, + "west": { + "uv": [ + 0, + 0, + 6.0, + 3.0250000000000004 + ], + "texture": "#dark_metal" + }, + "up": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 6.0 + ], + "texture": "#dark_metal" + }, + "down": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 6.0 + ], + "texture": "#dark_metal" + } + } + }, + { + "from": [ + 7.65, + 0.16000000000000014, + 25.0 + ], + "to": [ + 8.35, + 2.635, + 28.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 2.4749999999999996 + ], + "texture": "#dark_metal" + }, + "south": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 2.4749999999999996 + ], + "texture": "#dark_metal" + }, + "east": { + "uv": [ + 0, + 0, + 3.0, + 2.4749999999999996 + ], + "texture": "#dark_metal" + }, + "west": { + "uv": [ + 0, + 0, + 3.0, + 2.4749999999999996 + ], + "texture": "#dark_metal" + }, + "up": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 3.0 + ], + "texture": "#dark_metal" + }, + "down": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 3.0 + ], + "texture": "#dark_metal" + } + } + }, + { + "from": [ + 6.08, + 6.08, + 28.0 + ], + "to": [ + 9.92, + 9.92, + 29.6 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.84, + 3.84 + ], + "texture": "#bare_nozzle" + }, + "south": { + "uv": [ + 0, + 0, + 3.84, + 3.84 + ], + "texture": "#bare_nozzle" + }, + "east": { + "uv": [ + 0, + 0, + 1.6000000000000014, + 3.84 + ], + "texture": "#bare_nozzle" + }, + "west": { + "uv": [ + 0, + 0, + 1.6000000000000014, + 3.84 + ], + "texture": "#bare_nozzle" + }, + "up": { + "uv": [ + 0, + 0, + 3.84, + 1.6000000000000014 + ], + "texture": "#bare_nozzle" + }, + "down": { + "uv": [ + 0, + 0, + 3.84, + 1.6000000000000014 + ], + "texture": "#bare_nozzle" + } + } + }, + { + "from": [ + 6.68, + 6.68, + 29.6 + ], + "to": [ + 9.32, + 9.32, + 29.9 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 2.6400000000000006, + 2.6400000000000006 + ], + "texture": "#glow_ember" + }, + "south": { + "uv": [ + 0, + 0, + 2.6400000000000006, + 2.6400000000000006 + ], + "texture": "#glow_ember" + }, + "east": { + "uv": [ + 0, + 0, + 0.29999999999999716, + 2.6400000000000006 + ], + "texture": "#glow_ember" + }, + "west": { + "uv": [ + 0, + 0, + 0.29999999999999716, + 2.6400000000000006 + ], + "texture": "#glow_ember" + }, + "up": { + "uv": [ + 0, + 0, + 2.6400000000000006, + 0.29999999999999716 + ], + "texture": "#glow_ember" + }, + "down": { + "uv": [ + 0, + 0, + 2.6400000000000006, + 0.29999999999999716 + ], + "texture": "#glow_ember" } } } diff --git a/airdef-mod/assets/airdef/textures/block/bare_antenna.png b/airdef-mod/assets/airdef/textures/block/bare_antenna.png new file mode 100644 index 0000000..6a359a2 Binary files /dev/null and b/airdef-mod/assets/airdef/textures/block/bare_antenna.png differ diff --git a/airdef-mod/assets/airdef/textures/block/bare_barrel.png b/airdef-mod/assets/airdef/textures/block/bare_barrel.png new file mode 100644 index 0000000..7f7a99a Binary files /dev/null and b/airdef-mod/assets/airdef/textures/block/bare_barrel.png differ diff --git a/airdef-mod/assets/airdef/textures/block/bare_barrel_b.png b/airdef-mod/assets/airdef/textures/block/bare_barrel_b.png new file mode 100644 index 0000000..b3f7b83 Binary files /dev/null and b/airdef-mod/assets/airdef/textures/block/bare_barrel_b.png differ diff --git a/airdef-mod/assets/airdef/textures/block/bare_dish.png b/airdef-mod/assets/airdef/textures/block/bare_dish.png new file mode 100644 index 0000000..d911575 Binary files /dev/null and b/airdef-mod/assets/airdef/textures/block/bare_dish.png differ diff --git a/airdef-mod/assets/airdef/textures/block/bare_lamp.png b/airdef-mod/assets/airdef/textures/block/bare_lamp.png new file mode 100644 index 0000000..4e68dff Binary files /dev/null and b/airdef-mod/assets/airdef/textures/block/bare_lamp.png differ diff --git a/airdef-mod/assets/airdef/textures/block/bare_lamp_b.png b/airdef-mod/assets/airdef/textures/block/bare_lamp_b.png new file mode 100644 index 0000000..333ddac Binary files /dev/null and b/airdef-mod/assets/airdef/textures/block/bare_lamp_b.png differ diff --git a/airdef-mod/assets/airdef/textures/block/bare_nozzle.png b/airdef-mod/assets/airdef/textures/block/bare_nozzle.png new file mode 100644 index 0000000..326dddb Binary files /dev/null and b/airdef-mod/assets/airdef/textures/block/bare_nozzle.png differ diff --git a/airdef-mod/assets/airdef/textures/block/bare_nozzle_b.png b/airdef-mod/assets/airdef/textures/block/bare_nozzle_b.png new file mode 100644 index 0000000..354ea9e Binary files /dev/null and b/airdef-mod/assets/airdef/textures/block/bare_nozzle_b.png differ diff --git a/airdef-mod/assets/airdef/textures/block/booster_b.png b/airdef-mod/assets/airdef/textures/block/booster_b.png new file mode 100644 index 0000000..e39ad4e Binary files /dev/null and b/airdef-mod/assets/airdef/textures/block/booster_b.png differ diff --git a/airdef-mod/assets/airdef/textures/block/canister.png b/airdef-mod/assets/airdef/textures/block/canister.png index 5032fa3..fabb539 100644 Binary files a/airdef-mod/assets/airdef/textures/block/canister.png and b/airdef-mod/assets/airdef/textures/block/canister.png differ diff --git a/airdef-mod/assets/airdef/textures/block/canister_b.png b/airdef-mod/assets/airdef/textures/block/canister_b.png new file mode 100644 index 0000000..afb4e1d Binary files /dev/null and b/airdef-mod/assets/airdef/textures/block/canister_b.png differ diff --git a/airdef-mod/assets/airdef/textures/block/canister_front_b.png b/airdef-mod/assets/airdef/textures/block/canister_front_b.png new file mode 100644 index 0000000..4ad4175 Binary files /dev/null and b/airdef-mod/assets/airdef/textures/block/canister_front_b.png differ diff --git a/airdef-mod/assets/airdef/textures/block/concrete_b.png b/airdef-mod/assets/airdef/textures/block/concrete_b.png new file mode 100644 index 0000000..9653a0f Binary files /dev/null and b/airdef-mod/assets/airdef/textures/block/concrete_b.png differ diff --git a/airdef-mod/assets/airdef/textures/block/crate_b.png b/airdef-mod/assets/airdef/textures/block/crate_b.png new file mode 100644 index 0000000..6c52930 Binary files /dev/null and b/airdef-mod/assets/airdef/textures/block/crate_b.png differ diff --git a/airdef-mod/assets/airdef/textures/block/dark_metal.png b/airdef-mod/assets/airdef/textures/block/dark_metal.png index f9045f5..47e5b46 100644 Binary files a/airdef-mod/assets/airdef/textures/block/dark_metal.png and b/airdef-mod/assets/airdef/textures/block/dark_metal.png differ diff --git a/airdef-mod/assets/airdef/textures/block/dark_metal_b.png b/airdef-mod/assets/airdef/textures/block/dark_metal_b.png new file mode 100644 index 0000000..c7326a6 Binary files /dev/null and b/airdef-mod/assets/airdef/textures/block/dark_metal_b.png differ diff --git a/airdef-mod/assets/airdef/textures/block/flecktarn.png b/airdef-mod/assets/airdef/textures/block/flecktarn.png index eda68ad..419ff0e 100644 Binary files a/airdef-mod/assets/airdef/textures/block/flecktarn.png and b/airdef-mod/assets/airdef/textures/block/flecktarn.png differ diff --git a/airdef-mod/assets/airdef/textures/block/flecktarn_b.png b/airdef-mod/assets/airdef/textures/block/flecktarn_b.png new file mode 100644 index 0000000..cd97e16 Binary files /dev/null and b/airdef-mod/assets/airdef/textures/block/flecktarn_b.png differ diff --git a/airdef-mod/assets/airdef/textures/block/flecktarn_s13.png b/airdef-mod/assets/airdef/textures/block/flecktarn_s13.png new file mode 100644 index 0000000..32bc84d Binary files /dev/null and b/airdef-mod/assets/airdef/textures/block/flecktarn_s13.png differ diff --git a/airdef-mod/assets/airdef/textures/block/flecktarn_s13_b.png b/airdef-mod/assets/airdef/textures/block/flecktarn_s13_b.png new file mode 100644 index 0000000..31d6f67 Binary files /dev/null and b/airdef-mod/assets/airdef/textures/block/flecktarn_s13_b.png differ diff --git a/airdef-mod/assets/airdef/textures/block/flecktarn_s21.png b/airdef-mod/assets/airdef/textures/block/flecktarn_s21.png new file mode 100644 index 0000000..97fe19e Binary files /dev/null and b/airdef-mod/assets/airdef/textures/block/flecktarn_s21.png differ diff --git a/airdef-mod/assets/airdef/textures/block/flecktarn_s21_b.png b/airdef-mod/assets/airdef/textures/block/flecktarn_s21_b.png new file mode 100644 index 0000000..5df07d2 Binary files /dev/null and b/airdef-mod/assets/airdef/textures/block/flecktarn_s21_b.png differ diff --git a/airdef-mod/assets/airdef/textures/block/flecktarn_s23.png b/airdef-mod/assets/airdef/textures/block/flecktarn_s23.png new file mode 100644 index 0000000..2c53c45 Binary files /dev/null and b/airdef-mod/assets/airdef/textures/block/flecktarn_s23.png differ diff --git a/airdef-mod/assets/airdef/textures/block/flecktarn_s23_b.png b/airdef-mod/assets/airdef/textures/block/flecktarn_s23_b.png new file mode 100644 index 0000000..84b787e Binary files /dev/null and b/airdef-mod/assets/airdef/textures/block/flecktarn_s23_b.png differ diff --git a/airdef-mod/assets/airdef/textures/block/flecktarn_s31.png b/airdef-mod/assets/airdef/textures/block/flecktarn_s31.png new file mode 100644 index 0000000..a35722b Binary files /dev/null and b/airdef-mod/assets/airdef/textures/block/flecktarn_s31.png differ diff --git a/airdef-mod/assets/airdef/textures/block/flecktarn_s31_b.png b/airdef-mod/assets/airdef/textures/block/flecktarn_s31_b.png new file mode 100644 index 0000000..ad4e0f5 Binary files /dev/null and b/airdef-mod/assets/airdef/textures/block/flecktarn_s31_b.png differ diff --git a/airdef-mod/assets/airdef/textures/block/geran.png b/airdef-mod/assets/airdef/textures/block/geran.png index 2d15e22..70ab1b5 100644 Binary files a/airdef-mod/assets/airdef/textures/block/geran.png and b/airdef-mod/assets/airdef/textures/block/geran.png differ diff --git a/airdef-mod/assets/airdef/textures/block/glass_cab.png b/airdef-mod/assets/airdef/textures/block/glass_cab.png new file mode 100644 index 0000000..5b7496c Binary files /dev/null and b/airdef-mod/assets/airdef/textures/block/glass_cab.png differ diff --git a/airdef-mod/assets/airdef/textures/block/glass_cab_b.png b/airdef-mod/assets/airdef/textures/block/glass_cab_b.png new file mode 100644 index 0000000..3a496fe Binary files /dev/null and b/airdef-mod/assets/airdef/textures/block/glass_cab_b.png differ diff --git a/airdef-mod/assets/airdef/textures/block/glow_ember.png b/airdef-mod/assets/airdef/textures/block/glow_ember.png new file mode 100644 index 0000000..669080c Binary files /dev/null and b/airdef-mod/assets/airdef/textures/block/glow_ember.png differ diff --git a/airdef-mod/assets/airdef/textures/block/hub.png b/airdef-mod/assets/airdef/textures/block/hub.png new file mode 100644 index 0000000..9b52b98 Binary files /dev/null and b/airdef-mod/assets/airdef/textures/block/hub.png differ diff --git a/airdef-mod/assets/airdef/textures/block/hub_b.png b/airdef-mod/assets/airdef/textures/block/hub_b.png new file mode 100644 index 0000000..b7758d5 Binary files /dev/null and b/airdef-mod/assets/airdef/textures/block/hub_b.png differ diff --git a/airdef-mod/assets/airdef/textures/block/kh101.png b/airdef-mod/assets/airdef/textures/block/kh101.png index 0641a31..a195884 100644 Binary files a/airdef-mod/assets/airdef/textures/block/kh101.png and b/airdef-mod/assets/airdef/textures/block/kh101.png differ diff --git a/airdef-mod/assets/airdef/textures/block/lamp_b.png b/airdef-mod/assets/airdef/textures/block/lamp_b.png new file mode 100644 index 0000000..dcd1789 Binary files /dev/null and b/airdef-mod/assets/airdef/textures/block/lamp_b.png differ diff --git a/airdef-mod/assets/airdef/textures/block/lancet.png b/airdef-mod/assets/airdef/textures/block/lancet.png index 7042a7e..4b1fd17 100644 Binary files a/airdef-mod/assets/airdef/textures/block/lancet.png and b/airdef-mod/assets/airdef/textures/block/lancet.png differ diff --git a/airdef-mod/assets/airdef/textures/block/metal.png b/airdef-mod/assets/airdef/textures/block/metal.png index acf9a34..8ee44f1 100644 Binary files a/airdef-mod/assets/airdef/textures/block/metal.png and b/airdef-mod/assets/airdef/textures/block/metal.png differ diff --git a/airdef-mod/assets/airdef/textures/block/metal_b.png b/airdef-mod/assets/airdef/textures/block/metal_b.png new file mode 100644 index 0000000..ae08c22 Binary files /dev/null and b/airdef-mod/assets/airdef/textures/block/metal_b.png differ diff --git a/airdef-mod/assets/airdef/textures/block/missile_grey.png b/airdef-mod/assets/airdef/textures/block/missile_grey.png index cab02fc..ae8f193 100644 Binary files a/airdef-mod/assets/airdef/textures/block/missile_grey.png and b/airdef-mod/assets/airdef/textures/block/missile_grey.png differ diff --git a/airdef-mod/assets/airdef/textures/block/missile_ru_b.png b/airdef-mod/assets/airdef/textures/block/missile_ru_b.png new file mode 100644 index 0000000..9ab6a9b Binary files /dev/null and b/airdef-mod/assets/airdef/textures/block/missile_ru_b.png differ diff --git a/airdef-mod/assets/airdef/textures/block/nato_green.png b/airdef-mod/assets/airdef/textures/block/nato_green.png index 8109d9a..541d3fa 100644 Binary files a/airdef-mod/assets/airdef/textures/block/nato_green.png and b/airdef-mod/assets/airdef/textures/block/nato_green.png differ diff --git a/airdef-mod/assets/airdef/textures/block/nato_green_b.png b/airdef-mod/assets/airdef/textures/block/nato_green_b.png new file mode 100644 index 0000000..54efbc5 Binary files /dev/null and b/airdef-mod/assets/airdef/textures/block/nato_green_b.png differ diff --git a/airdef-mod/assets/airdef/textures/block/nato_green_s21.png b/airdef-mod/assets/airdef/textures/block/nato_green_s21.png new file mode 100644 index 0000000..c068e47 Binary files /dev/null and b/airdef-mod/assets/airdef/textures/block/nato_green_s21.png differ diff --git a/airdef-mod/assets/airdef/textures/block/nato_green_s21_b.png b/airdef-mod/assets/airdef/textures/block/nato_green_s21_b.png new file mode 100644 index 0000000..27646dc Binary files /dev/null and b/airdef-mod/assets/airdef/textures/block/nato_green_s21_b.png differ diff --git a/airdef-mod/assets/airdef/textures/block/nato_green_s22.png b/airdef-mod/assets/airdef/textures/block/nato_green_s22.png new file mode 100644 index 0000000..b136731 Binary files /dev/null and b/airdef-mod/assets/airdef/textures/block/nato_green_s22.png differ diff --git a/airdef-mod/assets/airdef/textures/block/nato_green_s22_b.png b/airdef-mod/assets/airdef/textures/block/nato_green_s22_b.png new file mode 100644 index 0000000..79b54ee Binary files /dev/null and b/airdef-mod/assets/airdef/textures/block/nato_green_s22_b.png differ diff --git a/airdef-mod/assets/airdef/textures/block/nato_green_s23.png b/airdef-mod/assets/airdef/textures/block/nato_green_s23.png new file mode 100644 index 0000000..d9fe2f4 Binary files /dev/null and b/airdef-mod/assets/airdef/textures/block/nato_green_s23.png differ diff --git a/airdef-mod/assets/airdef/textures/block/nato_green_s23_b.png b/airdef-mod/assets/airdef/textures/block/nato_green_s23_b.png new file mode 100644 index 0000000..ed04c77 Binary files /dev/null and b/airdef-mod/assets/airdef/textures/block/nato_green_s23_b.png differ diff --git a/airdef-mod/assets/airdef/textures/block/nato_green_s31.png b/airdef-mod/assets/airdef/textures/block/nato_green_s31.png new file mode 100644 index 0000000..a2e5675 Binary files /dev/null and b/airdef-mod/assets/airdef/textures/block/nato_green_s31.png differ diff --git a/airdef-mod/assets/airdef/textures/block/nato_green_s31_b.png b/airdef-mod/assets/airdef/textures/block/nato_green_s31_b.png new file mode 100644 index 0000000..11b1564 Binary files /dev/null and b/airdef-mod/assets/airdef/textures/block/nato_green_s31_b.png differ diff --git a/airdef-mod/assets/airdef/textures/block/nato_tan.png b/airdef-mod/assets/airdef/textures/block/nato_tan.png index a71e45c..e399395 100644 Binary files a/airdef-mod/assets/airdef/textures/block/nato_tan.png and b/airdef-mod/assets/airdef/textures/block/nato_tan.png differ diff --git a/airdef-mod/assets/airdef/textures/block/radar_big.png b/airdef-mod/assets/airdef/textures/block/radar_big.png index 9055fb8..94b52da 100644 Binary files a/airdef-mod/assets/airdef/textures/block/radar_big.png and b/airdef-mod/assets/airdef/textures/block/radar_big.png differ diff --git a/airdef-mod/assets/airdef/textures/block/radar_face.png b/airdef-mod/assets/airdef/textures/block/radar_face.png index e01c2dd..e088599 100644 Binary files a/airdef-mod/assets/airdef/textures/block/radar_face.png and b/airdef-mod/assets/airdef/textures/block/radar_face.png differ diff --git a/airdef-mod/assets/airdef/textures/block/radar_face_b.png b/airdef-mod/assets/airdef/textures/block/radar_face_b.png new file mode 100644 index 0000000..2446980 Binary files /dev/null and b/airdef-mod/assets/airdef/textures/block/radar_face_b.png differ diff --git a/airdef-mod/assets/airdef/textures/block/rm_dark.png b/airdef-mod/assets/airdef/textures/block/rm_dark.png new file mode 100644 index 0000000..ebcdd07 Binary files /dev/null and b/airdef-mod/assets/airdef/textures/block/rm_dark.png differ diff --git a/airdef-mod/assets/airdef/textures/block/rm_dark_t.png b/airdef-mod/assets/airdef/textures/block/rm_dark_t.png new file mode 100644 index 0000000..f6f63d9 Binary files /dev/null and b/airdef-mod/assets/airdef/textures/block/rm_dark_t.png differ diff --git a/airdef-mod/assets/airdef/textures/block/rm_grey.png b/airdef-mod/assets/airdef/textures/block/rm_grey.png new file mode 100644 index 0000000..2b665d7 Binary files /dev/null and b/airdef-mod/assets/airdef/textures/block/rm_grey.png differ diff --git a/airdef-mod/assets/airdef/textures/block/rm_grey_t.png b/airdef-mod/assets/airdef/textures/block/rm_grey_t.png new file mode 100644 index 0000000..4f85479 Binary files /dev/null and b/airdef-mod/assets/airdef/textures/block/rm_grey_t.png differ diff --git a/airdef-mod/assets/airdef/textures/block/rm_khaki.png b/airdef-mod/assets/airdef/textures/block/rm_khaki.png new file mode 100644 index 0000000..f6d0521 Binary files /dev/null and b/airdef-mod/assets/airdef/textures/block/rm_khaki.png differ diff --git a/airdef-mod/assets/airdef/textures/block/rm_khaki_t.png b/airdef-mod/assets/airdef/textures/block/rm_khaki_t.png new file mode 100644 index 0000000..9a29309 Binary files /dev/null and b/airdef-mod/assets/airdef/textures/block/rm_khaki_t.png differ diff --git a/airdef-mod/assets/airdef/textures/block/rm_pac3.png b/airdef-mod/assets/airdef/textures/block/rm_pac3.png new file mode 100644 index 0000000..f37085f Binary files /dev/null and b/airdef-mod/assets/airdef/textures/block/rm_pac3.png differ diff --git a/airdef-mod/assets/airdef/textures/block/rm_pac3_t.png b/airdef-mod/assets/airdef/textures/block/rm_pac3_t.png new file mode 100644 index 0000000..6b0d56a Binary files /dev/null and b/airdef-mod/assets/airdef/textures/block/rm_pac3_t.png differ diff --git a/airdef-mod/assets/airdef/textures/block/rm_ru.png b/airdef-mod/assets/airdef/textures/block/rm_ru.png new file mode 100644 index 0000000..bf48306 Binary files /dev/null and b/airdef-mod/assets/airdef/textures/block/rm_ru.png differ diff --git a/airdef-mod/assets/airdef/textures/block/rm_ru_t.png b/airdef-mod/assets/airdef/textures/block/rm_ru_t.png new file mode 100644 index 0000000..53504f1 Binary files /dev/null and b/airdef-mod/assets/airdef/textures/block/rm_ru_t.png differ diff --git a/airdef-mod/assets/airdef/textures/block/rm_white.png b/airdef-mod/assets/airdef/textures/block/rm_white.png new file mode 100644 index 0000000..a4177af Binary files /dev/null and b/airdef-mod/assets/airdef/textures/block/rm_white.png differ diff --git a/airdef-mod/assets/airdef/textures/block/rm_white_t.png b/airdef-mod/assets/airdef/textures/block/rm_white_t.png new file mode 100644 index 0000000..2bb5842 Binary files /dev/null and b/airdef-mod/assets/airdef/textures/block/rm_white_t.png differ diff --git a/airdef-mod/assets/airdef/textures/block/ru_green.png b/airdef-mod/assets/airdef/textures/block/ru_green.png index 3e75ae8..d5c9679 100644 Binary files a/airdef-mod/assets/airdef/textures/block/ru_green.png and b/airdef-mod/assets/airdef/textures/block/ru_green.png differ diff --git a/airdef-mod/assets/airdef/textures/block/ru_green_b.png b/airdef-mod/assets/airdef/textures/block/ru_green_b.png new file mode 100644 index 0000000..7522020 Binary files /dev/null and b/airdef-mod/assets/airdef/textures/block/ru_green_b.png differ diff --git a/airdef-mod/assets/airdef/textures/block/ru_green_s12.png b/airdef-mod/assets/airdef/textures/block/ru_green_s12.png new file mode 100644 index 0000000..540499a Binary files /dev/null and b/airdef-mod/assets/airdef/textures/block/ru_green_s12.png differ diff --git a/airdef-mod/assets/airdef/textures/block/ru_green_s12_b.png b/airdef-mod/assets/airdef/textures/block/ru_green_s12_b.png new file mode 100644 index 0000000..5d32a66 Binary files /dev/null and b/airdef-mod/assets/airdef/textures/block/ru_green_s12_b.png differ diff --git a/airdef-mod/assets/airdef/textures/block/ru_green_s13.png b/airdef-mod/assets/airdef/textures/block/ru_green_s13.png new file mode 100644 index 0000000..2b7e616 Binary files /dev/null and b/airdef-mod/assets/airdef/textures/block/ru_green_s13.png differ diff --git a/airdef-mod/assets/airdef/textures/block/ru_green_s13_b.png b/airdef-mod/assets/airdef/textures/block/ru_green_s13_b.png new file mode 100644 index 0000000..1a3ed9b Binary files /dev/null and b/airdef-mod/assets/airdef/textures/block/ru_green_s13_b.png differ diff --git a/airdef-mod/assets/airdef/textures/block/ru_green_s21.png b/airdef-mod/assets/airdef/textures/block/ru_green_s21.png new file mode 100644 index 0000000..65467b2 Binary files /dev/null and b/airdef-mod/assets/airdef/textures/block/ru_green_s21.png differ diff --git a/airdef-mod/assets/airdef/textures/block/ru_green_s21_b.png b/airdef-mod/assets/airdef/textures/block/ru_green_s21_b.png new file mode 100644 index 0000000..a0db750 Binary files /dev/null and b/airdef-mod/assets/airdef/textures/block/ru_green_s21_b.png differ diff --git a/airdef-mod/assets/airdef/textures/block/ru_green_s22.png b/airdef-mod/assets/airdef/textures/block/ru_green_s22.png new file mode 100644 index 0000000..7b02402 Binary files /dev/null and b/airdef-mod/assets/airdef/textures/block/ru_green_s22.png differ diff --git a/airdef-mod/assets/airdef/textures/block/ru_green_s22_b.png b/airdef-mod/assets/airdef/textures/block/ru_green_s22_b.png new file mode 100644 index 0000000..4600d56 Binary files /dev/null and b/airdef-mod/assets/airdef/textures/block/ru_green_s22_b.png differ diff --git a/airdef-mod/assets/airdef/textures/block/ru_green_s23.png b/airdef-mod/assets/airdef/textures/block/ru_green_s23.png new file mode 100644 index 0000000..ee05048 Binary files /dev/null and b/airdef-mod/assets/airdef/textures/block/ru_green_s23.png differ diff --git a/airdef-mod/assets/airdef/textures/block/ru_green_s23_b.png b/airdef-mod/assets/airdef/textures/block/ru_green_s23_b.png new file mode 100644 index 0000000..b2f6fc7 Binary files /dev/null and b/airdef-mod/assets/airdef/textures/block/ru_green_s23_b.png differ diff --git a/airdef-mod/assets/airdef/textures/block/ru_green_s31.png b/airdef-mod/assets/airdef/textures/block/ru_green_s31.png new file mode 100644 index 0000000..d838f8b Binary files /dev/null and b/airdef-mod/assets/airdef/textures/block/ru_green_s31.png differ diff --git a/airdef-mod/assets/airdef/textures/block/ru_green_s31_b.png b/airdef-mod/assets/airdef/textures/block/ru_green_s31_b.png new file mode 100644 index 0000000..97a5d5a Binary files /dev/null and b/airdef-mod/assets/airdef/textures/block/ru_green_s31_b.png differ diff --git a/airdef-mod/assets/airdef/textures/block/ru_khaki.png b/airdef-mod/assets/airdef/textures/block/ru_khaki.png index 4293be3..f07dfe5 100644 Binary files a/airdef-mod/assets/airdef/textures/block/ru_khaki.png and b/airdef-mod/assets/airdef/textures/block/ru_khaki.png differ diff --git a/airdef-mod/assets/airdef/textures/block/ru_khaki_b.png b/airdef-mod/assets/airdef/textures/block/ru_khaki_b.png new file mode 100644 index 0000000..c3e886c Binary files /dev/null and b/airdef-mod/assets/airdef/textures/block/ru_khaki_b.png differ diff --git a/airdef-mod/assets/airdef/textures/block/ru_khaki_s13.png b/airdef-mod/assets/airdef/textures/block/ru_khaki_s13.png new file mode 100644 index 0000000..489cf35 Binary files /dev/null and b/airdef-mod/assets/airdef/textures/block/ru_khaki_s13.png differ diff --git a/airdef-mod/assets/airdef/textures/block/ru_khaki_s13_b.png b/airdef-mod/assets/airdef/textures/block/ru_khaki_s13_b.png new file mode 100644 index 0000000..92718af Binary files /dev/null and b/airdef-mod/assets/airdef/textures/block/ru_khaki_s13_b.png differ diff --git a/airdef-mod/assets/airdef/textures/block/ru_khaki_s21.png b/airdef-mod/assets/airdef/textures/block/ru_khaki_s21.png new file mode 100644 index 0000000..b1a17f2 Binary files /dev/null and b/airdef-mod/assets/airdef/textures/block/ru_khaki_s21.png differ diff --git a/airdef-mod/assets/airdef/textures/block/ru_khaki_s21_b.png b/airdef-mod/assets/airdef/textures/block/ru_khaki_s21_b.png new file mode 100644 index 0000000..1d82386 Binary files /dev/null and b/airdef-mod/assets/airdef/textures/block/ru_khaki_s21_b.png differ diff --git a/airdef-mod/assets/airdef/textures/block/ru_khaki_s22.png b/airdef-mod/assets/airdef/textures/block/ru_khaki_s22.png new file mode 100644 index 0000000..9203415 Binary files /dev/null and b/airdef-mod/assets/airdef/textures/block/ru_khaki_s22.png differ diff --git a/airdef-mod/assets/airdef/textures/block/ru_khaki_s22_b.png b/airdef-mod/assets/airdef/textures/block/ru_khaki_s22_b.png new file mode 100644 index 0000000..2b9a74f Binary files /dev/null and b/airdef-mod/assets/airdef/textures/block/ru_khaki_s22_b.png differ diff --git a/airdef-mod/assets/airdef/textures/block/ru_khaki_s23.png b/airdef-mod/assets/airdef/textures/block/ru_khaki_s23.png new file mode 100644 index 0000000..d3df8c5 Binary files /dev/null and b/airdef-mod/assets/airdef/textures/block/ru_khaki_s23.png differ diff --git a/airdef-mod/assets/airdef/textures/block/ru_khaki_s23_b.png b/airdef-mod/assets/airdef/textures/block/ru_khaki_s23_b.png new file mode 100644 index 0000000..4533859 Binary files /dev/null and b/airdef-mod/assets/airdef/textures/block/ru_khaki_s23_b.png differ diff --git a/airdef-mod/assets/airdef/textures/block/ru_khaki_s31.png b/airdef-mod/assets/airdef/textures/block/ru_khaki_s31.png new file mode 100644 index 0000000..b603f32 Binary files /dev/null and b/airdef-mod/assets/airdef/textures/block/ru_khaki_s31.png differ diff --git a/airdef-mod/assets/airdef/textures/block/ru_khaki_s31_b.png b/airdef-mod/assets/airdef/textures/block/ru_khaki_s31_b.png new file mode 100644 index 0000000..7071ca5 Binary files /dev/null and b/airdef-mod/assets/airdef/textures/block/ru_khaki_s31_b.png differ diff --git a/airdef-mod/assets/airdef/textures/block/shahed.png b/airdef-mod/assets/airdef/textures/block/shahed.png index 8b22425..a0e7b5f 100644 Binary files a/airdef-mod/assets/airdef/textures/block/shahed.png and b/airdef-mod/assets/airdef/textures/block/shahed.png differ diff --git a/airdef-mod/assets/airdef/textures/block/tire.png b/airdef-mod/assets/airdef/textures/block/tire.png index c0eac8d..5f78832 100644 Binary files a/airdef-mod/assets/airdef/textures/block/tire.png and b/airdef-mod/assets/airdef/textures/block/tire.png differ diff --git a/airdef-mod/assets/airdef/textures/block/tire_b.png b/airdef-mod/assets/airdef/textures/block/tire_b.png new file mode 100644 index 0000000..8084e0a Binary files /dev/null and b/airdef-mod/assets/airdef/textures/block/tire_b.png differ diff --git a/airdef-mod/assets/airdef/textures/block/track.png b/airdef-mod/assets/airdef/textures/block/track.png index e3286e5..580df31 100644 Binary files a/airdef-mod/assets/airdef/textures/block/track.png and b/airdef-mod/assets/airdef/textures/block/track.png differ diff --git a/airdef-mod/assets/airdef/textures/block/track_b.png b/airdef-mod/assets/airdef/textures/block/track_b.png new file mode 100644 index 0000000..a5c8183 Binary files /dev/null and b/airdef-mod/assets/airdef/textures/block/track_b.png differ diff --git a/airdef-mod/assets/airdef/textures/block/track_side.png b/airdef-mod/assets/airdef/textures/block/track_side.png new file mode 100644 index 0000000..a94209c Binary files /dev/null and b/airdef-mod/assets/airdef/textures/block/track_side.png differ diff --git a/airdef-mod/assets/airdef/textures/block/track_side_s31.png b/airdef-mod/assets/airdef/textures/block/track_side_s31.png new file mode 100644 index 0000000..ef5015b Binary files /dev/null and b/airdef-mod/assets/airdef/textures/block/track_side_s31.png differ diff --git a/airdef-mod/assets/airdef/textures/block/track_side_s31_b.png b/airdef-mod/assets/airdef/textures/block/track_side_s31_b.png new file mode 100644 index 0000000..57e8ba1 Binary files /dev/null and b/airdef-mod/assets/airdef/textures/block/track_side_s31_b.png differ diff --git a/airdef-mod/assets/airdef/textures/block/tube_b.png b/airdef-mod/assets/airdef/textures/block/tube_b.png new file mode 100644 index 0000000..2baed4c Binary files /dev/null and b/airdef-mod/assets/airdef/textures/block/tube_b.png differ diff --git a/airdef-mod/assets/airdef/textures/block/tube_cap_b.png b/airdef-mod/assets/airdef/textures/block/tube_cap_b.png new file mode 100644 index 0000000..6a1d264 Binary files /dev/null and b/airdef-mod/assets/airdef/textures/block/tube_cap_b.png differ diff --git a/airdef-mod/assets/airdef/textures/block/tubes6_b.png b/airdef-mod/assets/airdef/textures/block/tubes6_b.png new file mode 100644 index 0000000..f07d84c Binary files /dev/null and b/airdef-mod/assets/airdef/textures/block/tubes6_b.png differ diff --git a/airdef-mod/src/lib.rs b/airdef-mod/src/lib.rs index 9fb52e3..f431760 100644 --- a/airdef-mod/src/lib.rs +++ b/airdef-mod/src/lib.rs @@ -82,6 +82,11 @@ struct AirDef { film_prev: Option<(bool, bool)>, /// The world drawn beyond the render distance (replays and cameras see far off). far: bool, + /// The game's log of block changes (`render.world-log-start`): a replay shows the world as + /// it was at its moment, not the holes the raid left (None where the game has no such log). + block_log: Option, + /// A replay's time view was set (so it is cleared when the replay ends). + time_view: bool, /// The unit the move remote picked (its id), waiting for where to go. moving: Option, /// The HD lighting preset (the engine's lights, bloom, tone mapping). @@ -930,6 +935,34 @@ impl AirDef { render::set_far_terrain(far); } + /// The world's blocks as they were at the replay's moment `t` of raid `rec` (the holes the raid + /// made are not there yet); `show: false` puts the world back. + fn show_world_at(&mut self, rec: u32, t: f64, show: bool) { + let view = (|| { + let id = self.block_log.filter(|_| show)?; + let tick = self.sim.replay(rec)?.world_tick(t)?; + Some((id, tick)) + })(); + if view.is_some() || self.time_view { + render::set_world_time_view(view); + self.time_view = view.is_some(); + } + } + + /// Tells in the chat how far back the block log lets a replay of raid `rec` show the world. + fn say_block_log(&self, rec: &sim::record::Recording) { + let range = self.block_log.and_then(render::world_log_range); + let first = rec.first_tick(); + match (range, first) { + (None, _) => say("Журнал блоков недоступен: в повторе мир такой, как сейчас (воронки уже на месте)"), + (Some((earliest, _)), Some(first)) if earliest > first => say(&format!( + "Журнал блоков начался позже налёта (на {} с): воронки до того уже в мире, он показан с самого раннего известного момента", + (earliest - first) / 20 + )), + _ => {} + } + } + /// Plays the last recorded raid: "map", "full", "reel" or (with `event`) a clip. fn start_replay(&mut self, what: &str, event: Option) -> Result<(), String> { let n = self.sim.replays.len(); @@ -949,6 +982,7 @@ impl AirDef { } _ => replay::Mode::Map, }; + self.say_block_log(rec); self.replay = Some(replay::Player::new(rec.number, mode, &self.sim)); self.grid = false; input::claim_wheel(true); @@ -965,6 +999,7 @@ impl AirDef { self.set_effects(shader, hd); } self.replay = None; + self.show_world_at(0, 0.0, false); render::set_time_override(None); render::set_main_view(None); input::claim_wheel(false); @@ -986,6 +1021,7 @@ impl AirDef { }; let rec = &self.sim.replays[n - 1]; let f = film::Film::build(rec, which).ok_or("В этом налёте нечего показать")?; + self.say_block_log(rec); let mut player = replay::Player::new(rec.number, replay::Mode::Film(Box::new(f)), &self.sim); if let Some(o) = export { player.wait = true; @@ -1312,6 +1348,8 @@ impl Mod for AirDef { grid_ids: Vec::new(), wave: wave::WaveConfig::default(), replay: None, + block_log: None, + time_view: false, export: None, film_prev: None, smoke: Default::default(), @@ -1343,12 +1381,14 @@ impl Mod for AirDef { let _ = input::register_key("rp_exit", "Повтор: выход", "key.keyboard.backspace"); input::claim_items(&ITEMS.map(String::from)); render::set_post(include_str!("../shaders/effects.wgsl")); + me.block_log = Some(render::world_log_start()); me.sim.shader = true; me.apply_far(); Ok((me, Registration::new().command("airdef").on_tick())) } - fn tick(&mut self, _tick: u64) { + fn tick(&mut self, tick: u64) { + self.sim.engine_tick = tick; let Some(p) = player() else { return }; // Each world keeps its own systems, objects and settings: loaded when it opens. let world = game::world_id(); @@ -1485,6 +1525,7 @@ impl Mod for AirDef { render::set_main_view(r.filming().then(|| r.view_id())); // The sky of the raid, not of now (None for a raid whose clock was unknown). render::set_time_override(r.day_time(&self.sim)); + self.show_world_at(r.rec, r.time(), r.filming()); self.monitor_shown = true; } else if self.grid { let stale = self.grid_ids.iter().any(|id| !self.sim.sams.iter().any(|s| s.id == *id)); diff --git a/airdef-mod/src/sim/damage.rs b/airdef-mod/src/sim/damage.rs index 7a67d1d..7e5c2c5 100644 --- a/airdef-mod/src/sim/damage.rs +++ b/airdef-mod/src/sim/damage.rs @@ -477,10 +477,11 @@ impl Sim { self.fires.extinguish(); n } +} - /// A wreck: the hull sunk and turned, the launcher or turret thrown down beside it. - pub(super) fn draw_wreck(&self, i: usize, out: &mut Out) { - let sam = &self.sams[i]; +/// A wreck: the hull sunk and turned, the launcher or turret thrown down beside it (a live system's, or a replay's ghost). +pub(super) fn draw_wreck_of(sam: &Sam, out: &mut Out) { + { let s = sam.kind.spec().scale; let tilt = DQuat::from_rotation_y(sam.heading) * DQuat::from_rotation_z(0.12) * DQuat::from_rotation_x(-0.06); let hull = sam.pos + DVec3::Y * (0.5 * s - 0.35); @@ -488,9 +489,9 @@ impl Sim { let thrown = DQuat::from_rotation_y(sam.heading + 1.1) * DQuat::from_rotation_z(1.2); let parts = &sam.kind.spec().parts; let (body, part) = (parts.body, parts.launcher.or(parts.pack)); - out.model(sam.id, body, hull, tilt, s, false); + out.model(sam.id, super::units::wreck(body), hull, tilt, s, false); if let Some(part) = part { - out.model(sam.id + 1, part, sam.pos + side + DVec3::Y * 0.4 * s, thrown, s, false); + out.model(sam.id + 1, super::units::wreck(part), sam.pos + side + DVec3::Y * 0.4 * s, thrown, s, false); } } } diff --git a/airdef-mod/src/sim/mod.rs b/airdef-mod/src/sim/mod.rs index 3c1124c..ae507c8 100644 --- a/airdef-mod/src/sim/mod.rs +++ b/airdef-mod/src/sim/mod.rs @@ -1395,6 +1395,8 @@ pub struct Sim { next: u32, pub rng: Rng, pub tick: u64, + /// The game's tick number (the one `tick` is called with), for a recording to know the world's time by. + pub engine_tick: u64, pub kills: u32, pub hits: u32, /// Drones that struck the land or a building short of their aim. @@ -1460,6 +1462,7 @@ impl Sim { next: 1, rng: Rng::new(seed), tick: 0, + engine_tick: 0, kills: 0, hits: 0, crashes: 0, diff --git a/airdef-mod/src/sim/record.rs b/airdef-mod/src/sim/record.rs index ccf69cf..a0e0da6 100644 --- a/airdef-mod/src/sim/record.rs +++ b/airdef-mod/src/sim/record.rs @@ -5,6 +5,95 @@ //! has been clear a while; the last few are kept. use super::*; +/// A system's pose at a moment of a recording. +#[derive(Clone, Copy, PartialEq, Debug)] +pub struct SamKey { + /// The recording's tick. + pub at: u32, + /// Relative to the recording's origin. + pos: [f32; 3], + heading: f32, + /// Where the launcher or turret points. + yaw: f32, + pitch: f32, + /// The antenna's turn. + dish: f32, +} + +impl SamKey { + fn of(sam: &Sam, origin: DVec3, at: u32) -> Self { + let p = sam.pos - origin; + SamKey { + at, + pos: [p.x as f32, p.y as f32, p.z as f32], + heading: sam.heading as f32, + yaw: sam.yaw as f32, + pitch: sam.pitch as f32, + dish: sam.dish as f32, + } + } + /// The same pose (to within what could be seen). + fn same(&self, o: &SamKey) -> bool { + let near = |a: f32, b: f32, e: f32| (a - b).abs() < e; + (0..3).all(|i| near(self.pos[i], o.pos[i], 0.01)) + && near(self.heading, o.heading, 0.002) + && near(self.yaw, o.yaw, 0.002) + && near(self.pitch, o.pitch, 0.002) + && near(self.dish, o.dish, 0.002) + } +} + +/// A system through a recording: its poses (a new one only when it changed, with the +/// stillness before it marked), and when it was lost. +pub struct SamTrack { + pub id: u32, + pub kind: SamKind, + pub keys: Vec, + /// The recording's tick it was destroyed. + pub lost: Option, +} + +/// `a` turned toward `b` by `f` the short way round. +fn turn(a: f32, b: f32, f: f32) -> f32 { + let tau = std::f32::consts::TAU; + let d = (b - a + std::f32::consts::PI).rem_euclid(tau) - std::f32::consts::PI; + a + d * f +} + +impl SamTrack { + /// The pose at `t` (the recording's ticks, fractional); None before the system was first seen. + pub fn pose(&self, t: f64) -> Option { + let first = self.keys.first()?; + if t < first.at as f64 { + return None; + } + let i = self.keys.partition_point(|k| k.at as f64 <= t).saturating_sub(1); + let a = self.keys[i]; + let Some(b) = self.keys.get(i + 1) else { return Some(a) }; + let f = ((t - a.at as f64) / (b.at - a.at).max(1) as f64).clamp(0.0, 1.0) as f32; + let l = |x: f32, y: f32| x + (y - x) * f; + Some(SamKey { + at: a.at, + pos: [l(a.pos[0], b.pos[0]), l(a.pos[1], b.pos[1]), l(a.pos[2], b.pos[2])], + heading: turn(a.heading, b.heading, f), + yaw: turn(a.yaw, b.yaw, f), + pitch: l(a.pitch, b.pitch), + dish: turn(a.dish, b.dish, f), + }) + } + /// The system as it stood at `t`, as a ghost to draw with the ids from `id`. + pub fn ghost(&self, origin: DVec3, t: f64, id: u32) -> Option { + let k = self.pose(t)?; + let pos = origin + DVec3::new(k.pos[0] as f64, k.pos[1] as f64, k.pos[2] as f64); + let mut sam = Sam::new(id, self.kind, pos, k.heading as f64); + sam.yaw = k.yaw as f64; + sam.pitch = k.pitch as f64; + sam.dish = k.dish as f64; + sam.health = if self.lost.is_some_and(|l| t >= l as f64) { 0.0 } else { 1.0 }; + Some(sam) + } +} + /// Ticks between a track's points. pub const STEP: u32 = 2; /// The longest recording (10 minutes) and how many are kept. @@ -114,6 +203,13 @@ pub struct Recording { /// The systems and objects as they stood: (id, kind, where). pub sams: Vec<(u32, SamKind, DVec3)>, pub objects: Vec, + /// Every system's poses through the raid (the drawing of a replay: where it stood, which way + /// it pointed, whether it was still whole). + pub sam_tracks: Vec, + sam_index: HashMap, + /// The game's tick number as sampled with the clock: (recording tick, game tick). A replay + /// shows the world's blocks as of this time. + ticks: Vec<(u32, u64)>, /// The world clock's time of day as (recording tick, day ticks), sampled on every /// `TIME_STEP`-th tick the clock was known: replays show the sky of the raid, not the current /// one. A tick the clock was unknown has no sample (a gap), so a late start or a lost clock @@ -261,10 +357,51 @@ impl Recording { tally: Tally::default(), sams: sim.sams.iter().map(|s| (s.id, s.kind, s.pos)).collect(), objects: sim.targets.clone(), + sam_tracks: Vec::new(), + sam_index: HashMap::new(), + ticks: Vec::new(), times: Vec::new(), quiet: 0, } } + /// Notes the systems' poses at the recording's tick `now`: a pose only when it changed, with + /// the pose it held marked before it so a replay doesn't glide through the stillness. + fn note_sams(&mut self, sams: &[Sam], now: u32) { + for sam in sams { + let key = SamKey::of(sam, self.origin, now); + let i = *self.sam_index.entry(sam.id).or_insert_with(|| { + self.sam_tracks.push(SamTrack { id: sam.id, kind: sam.kind, keys: Vec::new(), lost: None }); + self.sam_tracks.len() - 1 + }); + let track = &mut self.sam_tracks[i]; + match track.keys.last().copied() { + None => track.keys.push(key), + Some(last) if last.same(&key) => {} + Some(last) => { + if last.at + STEP < now { + track.keys.push(SamKey { at: now - STEP, ..last }); + } + track.keys.push(key); + } + } + } + } + /// The game's tick at the recording's tick `t` (fractional), if it was known: the samples run + /// on at the pace of the ticks between them (a pause or a gap is a step). + pub fn world_tick(&self, t: f64) -> Option { + let t = t.max(0.0); + let i = self.ticks.partition_point(|s| s.0 as f64 <= t).checked_sub(1).or(if self.ticks.is_empty() { None } else { Some(0) })?; + let (ta, a) = self.ticks[i]; + let ahead = (t - ta as f64).max(0.0); + Some(match self.ticks.get(i + 1) { + Some(&(tb, b)) if b >= a && b - a <= 2 * (tb - ta).max(1) as u64 => a + (ahead.min((tb - ta) as f64) * (b - a) as f64 / (tb - ta).max(1) as f64) as u64, + _ => a + ahead as u64, + }) + } + /// The game tick the recording began at. + pub fn first_tick(&self) -> Option { + self.ticks.first().map(|s| s.1) + } fn point(&mut self, id: u32, what: What, pos: DVec3) { let rel = pos - self.origin; let q = [rel.x as f32, rel.y as f32, rel.z as f32]; @@ -337,6 +474,11 @@ impl Sim { { r.tracks[i].fell = Some(at); } + if let EventKind::SamLost { sam, .. } = kind + && let Some(&i) = r.sam_index.get(&sam) + { + r.sam_tracks[i].lost.get_or_insert(at); + } r.events.push(Event { at, pos, kind }); } } @@ -355,12 +497,15 @@ impl Sim { self.rec = Some(Recording::new(self.recordings, self)); } let Some(r) = &mut self.rec else { return }; - if r.len % TIME_STEP == 0 - && let Some(dt) = self.day_time - { - r.times.push((r.len, dt)); + if r.len % TIME_STEP == 0 { + if let Some(dt) = self.day_time { + r.times.push((r.len, dt)); + } + r.ticks.push((r.len, self.engine_tick)); } if r.len % STEP == 0 { + let now = r.len; + r.note_sams(&self.sams, now); for d in &self.drones { r.point(d.id, What::Drone(d.kind), d.pos); } @@ -434,6 +579,14 @@ impl Sim { } } } + // The air-defence systems as they stood: where, which way, the launcher or turret where it + // pointed, a wreck once lost. + let mut rng = Rng(1); + for (k, st) in rec.sam_tracks.iter().enumerate() { + if let Some(ghost) = st.ghost(rec.origin, t, base + 0x0040_0000 + k as u32 * PARTS) { + units::draw_sam_model(&ghost, &mut rng, out); + } + } // Fires: what the events left burning (the flames dim and the smoke thickens with time), // out when their life ends. for f in replay_fires(rec, t) { @@ -471,3 +624,88 @@ impl Sim { } } } + +#[cfg(test)] +mod tests { + use super::*; + + fn sam_at(x: f64, heading: f64, yaw: f64) -> Sam { + let mut s = Sam::new(7, SamKind::S400, DVec3::new(x, 64.0, 0.0), heading); + s.yaw = yaw; + s + } + + fn recording() -> Recording { + Recording { + number: 1, + origin: DVec3::ZERO, + len: 0, + tracks: Vec::new(), + index: HashMap::new(), + events: Vec::new(), + tally: Tally::default(), + sams: Vec::new(), + objects: Vec::new(), + sam_tracks: Vec::new(), + sam_index: HashMap::new(), + ticks: Vec::new(), + times: Vec::new(), + quiet: 0, + } + } + + #[test] + fn a_system_keeps_its_pose_through_stillness_and_moves_when_it_moved() { + let mut r = recording(); + // Still for 20 ticks, then the turret swings and the vehicle drives. + for now in (0..=20).step_by(STEP as usize) { + r.note_sams(&[sam_at(0.0, 0.0, 0.0)], now); + } + assert_eq!(r.sam_tracks[0].keys.len(), 1, "stillness is one key"); + r.note_sams(&[sam_at(4.0, 0.0, 1.0)], 22); + let t = &r.sam_tracks[0]; + let pose = |tick: f64| t.pose(tick).unwrap(); + // Held at the old pose until just before the change, not gliding over the stillness. + assert!(pose(10.0).pos[0].abs() < 1e-6 && pose(10.0).yaw.abs() < 1e-6); + assert!(pose(20.0).pos[0].abs() < 1e-6); + // Half way through the move. + assert!((pose(21.0).pos[0] - 2.0).abs() < 1e-4 && (pose(21.0).yaw - 0.5).abs() < 1e-4); + assert!((pose(100.0).pos[0] - 4.0).abs() < 1e-6); + } + + #[test] + fn a_system_first_seen_later_is_not_drawn_before() { + let mut r = recording(); + r.note_sams(&[sam_at(0.0, 0.0, 0.0)], 40); + assert!(r.sam_tracks[0].pose(10.0).is_none()); + assert!(r.sam_tracks[0].pose(40.0).is_some()); + } + + #[test] + fn angles_turn_the_short_way_and_a_lost_system_is_a_wreck() { + let mut r = recording(); + r.note_sams(&[sam_at(0.0, 0.0, 6.2)], 0); + r.note_sams(&[sam_at(0.0, 0.0, 0.1)], 2); + let t = &mut r.sam_tracks[0]; + let mid = t.pose(1.0).unwrap().yaw; + assert!(!(0.2..6.0).contains(&mid), "through zero, not back round: {mid}"); + assert!(t.ghost(DVec3::ZERO, 1.0, 0).unwrap().alive()); + t.lost = Some(30); + assert!(t.ghost(DVec3::ZERO, 29.0, 0).unwrap().alive()); + assert!(!t.ghost(DVec3::ZERO, 31.0, 0).unwrap().alive()); + } + + #[test] + fn the_games_tick_is_known_through_the_recording() { + let mut r = recording(); + assert_eq!(r.world_tick(5.0), None); + r.ticks = vec![(0, 1000), (20, 1020), (40, 1040), (60, 1100)]; + assert_eq!(r.first_tick(), Some(1000)); + assert_eq!(r.world_tick(0.0), Some(1000)); + assert_eq!(r.world_tick(10.0), Some(1010)); + assert_eq!(r.world_tick(30.0), Some(1030)); + // A jump of the game's ticks between samples (the recording paused or a gap) is a step. + assert_eq!(r.world_tick(50.0), Some(1040 + 10)); + assert_eq!(r.world_tick(70.0), Some(1100 + 10)); + } +} diff --git a/airdef-mod/src/sim/units.rs b/airdef-mod/src/sim/units.rs index 810816d..b6c33fa 100644 --- a/airdef-mod/src/sim/units.rs +++ b/airdef-mod/src/sim/units.rs @@ -631,11 +631,16 @@ impl Sam { impl Sim { /// Draws unit `i`: its vehicle, its launcher or turret where it points, its antennas turning. pub(super) fn draw_sam(&mut self, i: usize, out: &mut Out) { - if !self.sams[i].alive() { - self.draw_wreck(i, out); - return; - } - let sam = &self.sams[i]; + draw_sam_model(&self.sams[i], &mut self.rng, out); + } +} + +/// Draws a system as it stands (a live one, or a replay's ghost built from the recording). +pub(super) fn draw_sam_model(sam: &Sam, rng: &mut Rng, out: &mut Out) { + if !sam.alive() { + damage::draw_wreck_of(sam, out); + return; + } let spec = sam.kind.spec(); let parts = &spec.parts; let base = sam.base(); @@ -709,9 +714,43 @@ impl Sim { _ => &[], }; for (n, b) in barrels.iter().enumerate() { - let r = rot * DQuat::from_rotation_z(self.rng.f() * TAU); + let r = rot * DQuat::from_rotation_z(rng.f() * TAU); out.model(id + 12 + n as u32, "airdef:flash", mount + rot * *b * s, r, 0.9, true); } } } + +/// The charred variant of a part's model, for wrecks (tools/gen_models.py `WRECKS`); a part without one keeps its model. +pub(super) fn wreck(model: &'static str) -> &'static str { + match model { + "airdef:patriot_trailer" => "airdef:patriot_trailer_burnt", + "airdef:patriot_launcher" => "airdef:patriot_launcher_burnt", + "airdef:gepard_hull" => "airdef:gepard_hull_burnt", + "airdef:gepard_turret" => "airdef:gepard_turret_burnt", + "airdef:gepard_guns" => "airdef:gepard_guns_burnt", + "airdef:pantsir_truck" => "airdef:pantsir_truck_burnt", + "airdef:pantsir_turret" => "airdef:pantsir_turret_burnt", + "airdef:pantsir_pack" => "airdef:pantsir_pack_burnt", + "airdef:s400_chassis" => "airdef:s400_chassis_burnt", + "airdef:s400_tubes" => "airdef:s400_tubes_burnt", + "airdef:s500_chassis" => "airdef:s500_chassis_burnt", + "airdef:s500_tubes" => "airdef:s500_tubes_burnt", + "airdef:irist_chassis" => "airdef:irist_chassis_burnt", + "airdef:irist_tubes" => "airdef:irist_tubes_burnt", + "airdef:nasams_trailer" => "airdef:nasams_trailer_burnt", + "airdef:nasams_launcher" => "airdef:nasams_launcher_burnt", + "airdef:buk_chassis" => "airdef:buk_chassis_burnt", + "airdef:buk_turret" => "airdef:buk_turret_burnt", + "airdef:buk_rails" => "airdef:buk_rails_burnt", + "airdef:tor_chassis" => "airdef:tor_chassis_burnt", + "airdef:tor_turret" => "airdef:tor_turret_burnt", + "airdef:p1sun_launcher" => "airdef:p1sun_launcher_burnt", + "airdef:radar_truck" => "airdef:radar_truck_burnt", + "airdef:depot" => "airdef:depot_burnt", + "airdef:tzm_truck" => "airdef:tzm_truck_burnt", + "airdef:ew_truck" => "airdef:ew_truck_burnt", + "airdef:searchlight" => "airdef:searchlight_burnt", + "airdef:searchlight_head" => "airdef:searchlight_head_burnt", + other => other, + } } diff --git a/docs/HD-RENDERER.md b/docs/HD-RENDERER.md index 5fbe758..4fbc24d 100644 --- a/docs/HD-RENDERER.md +++ b/docs/HD-RENDERER.md @@ -226,6 +226,7 @@ HORIZON_HD_TAA=0 --out run-home-bench/out/taa-off` — A/B; `--baseline run-home | #45: `gfx/hd.rs` разделён на модуль `gfx/hd/` (по файлу на проход: `shadows`, `gbuffer`, `ao`, `sky`, `volumes`, `lighting`+`tiles`, `water`, `taa`, `bloom`, `tonemap`, `frame`), WGSL вынесен в `.wgsl` (`include_str!`, общая прелюдия), у каждого прохода своя структура ресурсов/пайплайнов; контракты цвета, глубины, альф и времени записаны в `hd/mod.rs` и в начале файлов проходов; тесты привязок и размера `HdFrame`. Вид не менялся (сверка `tools/hd_bench.py`) | готово | в рабочем дереве форка | | #39: веер восхода `vanilla_sunrise_weight` отсекается до цикла по 16 треугольникам выше горизонта (знак x стороны солнца и наклон ≤ α/3; проверено перебором 200 тыс. лучей без пропусков); `hd lighting` на рассвете 5.3 → 3.3 мс (M-серия, 2560×1440) | готово | в рабочем дереве форка | +| Облака в воде, перистые, туман по рельефу, лучи, тень облаков при низком солнце, дальний дым (768 блоков) | готово, в рабочем дереве форка; тайминги не сняты чисто | не закоммичено | | Материалы и блики (план 5): G-буфер `levels.zw` = шероховатость, металличность; GGX-блик солнца с Френелем и отражение неба (`sky_along`/`atmosphere_sky`) в `shade_surface`; мокрые поверхности и лужи в дождь (`HdFrame.surface`); `HORIZON_HD_SPECULAR=0` — выкл. | готово | в рабочем дереве форка | | Ветер (план 7): листва и растения качаются в вершинной стадии террейна (`Globals.hd_wind`, `hd_materials`), те же смещения в тенях; `HORIZON_HD_WIND=0` — выкл. | готово | в рабочем дереве форка | | #67: облака марш идут до ближайшей поверхности (`fs_cloud` читает глубину мира, вторая цель — длина луча, история отбрасывается при другой длине); `fs_light` кладёт облака на все пиксели (`cloud_at`: 4 текселя с весом по близости длины луча), под туман и над поверхностью, для воды — в `air`; луч внутри слоя вдоль горизонта больше не пропускается | готово; проверено только пустой полигон (нет гор/техники в слое, снимки `scratchpad/c*.png`), бюджет GPU на Mac не мерился | в рабочем дереве форка | @@ -249,7 +250,7 @@ HORIZON_HD_TAA=0 --out run-home-bench/out/taa-off` — A/B; `--baseline run-home 3. **Небо и атмосфера** — СДЕЛАНО (патч 22, см. «Небо и свет» ниже). Исходное ТЗ: рассеяние Рэлея/Ми (предвычисленная LUT пропускания и небесного цвета в маленькой текстуре), солнце/луна дисками, звёзды из ванили; туман и лучи берут цвет из той же модели. Учесть дождь (`weather`), закат, Незер/Энд (там — ванильное небо). -4. **Объёмные облака** — СДЕЛАНО (патч 24, см. «Закат, облака и туман»). Осталось: перистые/высококучевые слои Photon, облака в отражении воды. +4. **Объёмные облака** — СДЕЛАНО (патч 24, см. «Закат, облака и туман»). Перистые и облака в воде сделаны (см. «Облака, перистые, туман по рельефу»). 5. **Блики и материалы** — СДЕЛАНО (см. «Материалы, мокрое, ветер»). Исходное ТЗ: specular солнца для металла техники (маска по оверлею/альбедо или атрибут модели из мода), мокрые поверхности и лужи в дождь. 6. **PCSS** (мягкость тени по расстоянию до тенеотбрасывателя) и цветные тени через стекло/листву. @@ -308,8 +309,15 @@ HORIZON_HD_TAA=0 --out run-home-bench/out/taa-off` — A/B; `--baseline run-home - **Туман (25).** `fs_fog`: 18 шагов, плотность `fog_sigma` (высотная дымка от y=62, масштаб 42; утренний туман — пока солнце на «утренней» стороне и низко; пятна из 3D-шума; дождь; затухание ниже y≈28–58, чтобы не светить в пещерах), свет — Photon-смесь двух HG, «вечернее свечение» ×1…3. Старые 14 шагов лучей остаются при `HORIZON_HD_VOLFOG=0`; ореолы вокруг источников мода — всегда. - **Тайминги.** Метки Metal (`HORIZON_SHADER_PACK_TIMING=1`, Hills, 2560×1440): `hd clouds` ≈ 6 мс (завышено: метка ловит ожидание соседних проходов), `hd cloud shadows` 0.2–3 (шум), `hd fog` ≈ 1.3. По среднему кадру GPU «оба выкл → оба вкл»: +0.2…3.7 мс (замеры шумные: рядом шла чужая игра на том же GPU). Как удешевить: у облаков — длина шага (14) и потолок шагов (26) в `fs_cloud`, 3 шага света, 4 октавы, облака в четверть разрешения; у тумана — `FOG_STEPS`. - **Разработка шейдеров.** `HORIZON_HD_SHADER_DIR=<папка>`: каждый HD-шейдер читается из `<папка>/<метка>.wgsl` (записывается из встроенного, если файла нет; это тело без прелюдии, она добавляется всегда) — правки видны после перезапуска игры без пересборки; готовое переносится в `gfx/hd/*.wgsl` вручную. -- **Слабые места.** Облака не отражаются в воде (SSR берёт небо без облаков); не закрывают далёкую землю выше слоя (только небо); карта теней облаков ±1200 блоков и почти не работает при солнце ниже ~10°; туман не знает рельефа (только высоту над y=62); нет перистых облаков; на быстром повороте камеры история облаков отбрасывается (кратковременный шум). +- **Слабые места (после доработки облаков и тумана).** Облака не закрывают далёкую землю выше слоя (только небо); карта теней облаков теперь центрируется на проекции камеры вдоль солнца (работает и при низком солнце, гаснет плавно при высоте солнца 0.03..0.2), но текстель карты ~9 блоков; перистые облака и панорама — без тени на землю; туман знает рельеф только в 512 блоках вокруг камеры (карта 8-блоковых клеток, деревья считаются минимумом из 4 проб); история облаков на быстром повороте держится сильнее (порог расхождения шире), но на краю экрана свежие пиксели остаются шумными; тайминги Metal в этой работе не сняты чисто (на машине шли другие игры, load average 65). +## Облака, перистые, туман по рельефу, дальний дым (доработка) + +- **Облака в отражениях.** Проход `hd cloud sky` (`fs_cloud_sky` в `cloud.wgsl`): панорама облаков 256×64 (`Rgba16Float`, азимут от +x по кругу × v = √(высота/(π/2))), марш кучевых «lite» (14 шагов, 2 шага света, без тоннелей дыма) + перистые, смешивается с прошлым кадром (0.8, без репроекции: история в мировых направлениях). Пинг-понг идёт тем же `flip`, что у облаков. Читает её `sky_with_clouds` (`pano_funcs.wgsl`, маркер `//PANO`): привязка 21 в `fs_light` (отражение неба на мокром/металле) и 12 в композите воды (`sky_along`). Групп воды теперь две (по `flip`). +- **Перистые.** `cirrus()` в `cloud.wgsl`: плоский слой на 900 блоков (`CIRRUS_ABOVE` над основанием кучевых), 2D-шум (каналы `noise2`, вытянут вдоль ветра, масштабы делят 65536), без марша света: прямой свет = цвет солнца облаков × (0.5 + 3·HG(0.7)) плюс небо; на закате цвет берётся из `cloud_sun`; дымка по расстоянию, гаснет у горизонта; дождь повышает покрытие (`cloud_cam.z`) и затемняет небесную долю. Складывается за кучевыми (`behind`), только на небо. У кучевых при дожде темнее небесный свет. +- **Туман по рельефу.** `gfx/hd/ground.rs`: карта 64×64 клетки по 8 блоков (`Rg16Float`: высота земли, глубина котловины = среднее в ±48 блоков минус высота), тороидальная (индекс = клетка mod 64, sampler Repeat, uv = мир/512). CPU обновляет по 256 клеток за кадр (4 пробы `world_surface`, минимум), при телепорте — всю карту; размытие и загрузка — раз в 4 кадра при изменениях. Данные: `Frame::hd_ground` (замыкание, `game.rs`). `fog_sigma`: утренний туман льнёт к земле и заполняет котловину до 75% глубины, немного дневной дымки в долинах, затухание ниже земли (g−14..g−3) вместо абсолютного y 28–58. Привязка 9 тумана. +- **Лучи.** `FOG_SUN` 1.1→1.35 (у дыма осталось 1.1) и плотность ×(1…1.9) при низком солнце (`low_sun`); в лесу Hills утром лучи заметны. +- **Дальний дым (#54).** Второй каскад сетки дыма: те же 128×64×128 клеток по 12 блоков (`FAR_CELL`): 768 блоков по горизонтали (192 вниз, 576 вверх), трубки не тоньше 7.2 блока, до 6144 сегментов (`FAR_MAX_SEGMENTS`); ближний — как раньше (192 блока, 3072). Проход `hd smoke grid far`; привязка 10 тумана; `HdFrame.smoke_far`, `smoke.w` = «дальняя сетка не пуста». В `fog.wgsl` два марша (`march_smoke(..., far)`): ближний до 200 блоков, дальний (шаг 12, до 72 шагов) до 800; вес ближнего — `smoke_near_cover` (плавно 1→0 на последних 8 клетках), дальнего — остаток: сумма 1, шва нет; дальний гаснет на последних 6 клетках. Игра (`mod_models.rs: mod_smoke`) шлёт сегменты до 900 блоков и до 8192. Не проверено глазами: полёт дронов на 700 блоков (`/airdef wave shahed 8 700` за время ожидания трасс не показал). ## Заметки по исправлениям #35–#41 (преемнику) - **Цели света.** `fs_light` пишет две цели: `lit` и `air` (`Rgba16Float`). Альфа `lit`: 1 — обычный пиксель, 0.5 — вода (в `lit` дно без воздуха, в `air` рассеяние воздуха до поверхности и пропускание в альфе), 0.6 — прозрачное перед водой (в `lit` сцена как нарисована, в `air.rgb` освещённое дно). Привязка 11 композита воды — `air`. diff --git a/horizon-patches/0001-Mod-API-AirDef-fork-world-models-client-particles-so.patch b/horizon-patches/0001-Mod-API-AirDef-fork-world-models-client-particles-so.patch index 6765fac..5b276bf 100644 --- a/horizon-patches/0001-Mod-API-AirDef-fork-world-models-client-particles-so.patch +++ b/horizon-patches/0001-Mod-API-AirDef-fork-world-models-client-particles-so.patch @@ -1,7 +1,7 @@ From 3de7a6875140a107e28563cc44489b55f5794517 Mon Sep 17 00:00:00 2001 From: chexit Date: Wed, 28 Oct 2026 12:37:45 +0300 -Subject: [PATCH 01/32] Mod API (AirDef fork): world models, client particles, +Subject: [PATCH 01/33] Mod API (AirDef fork): world models, client particles, sounds, ground heights render.set-models draws block models with an interpolated pose per id; diff --git a/horizon-patches/0002-cargo-horizon-mod-report-particles-and-sounds.patch b/horizon-patches/0002-cargo-horizon-mod-report-particles-and-sounds.patch index 55f6f13..8f53dab 100644 --- a/horizon-patches/0002-cargo-horizon-mod-report-particles-and-sounds.patch +++ b/horizon-patches/0002-cargo-horizon-mod-report-particles-and-sounds.patch @@ -1,7 +1,7 @@ From a6d64e6415bf618539af464e521091e72b72d72f Mon Sep 17 00:00:00 2001 From: chexit Date: Wed, 28 Oct 2026 12:39:45 +0300 -Subject: [PATCH 02/32] cargo-horizon-mod: report particles and sounds +Subject: [PATCH 02/33] cargo-horizon-mod: report particles and sounds Co-Authored-By: Claude Opus 5.5 --- diff --git a/horizon-patches/0003-Mod-API-AirDef-fork-full-screen-post-pass-for-mods.patch b/horizon-patches/0003-Mod-API-AirDef-fork-full-screen-post-pass-for-mods.patch index eef1670..77d5da7 100644 --- a/horizon-patches/0003-Mod-API-AirDef-fork-full-screen-post-pass-for-mods.patch +++ b/horizon-patches/0003-Mod-API-AirDef-fork-full-screen-post-pass-for-mods.patch @@ -1,7 +1,7 @@ From ee79b3562feebe51959a01f1585a9e85bd53ccb5 Mon Sep 17 00:00:00 2001 From: chexit Date: Wed, 28 Oct 2026 13:33:10 +0300 -Subject: [PATCH 03/32] Mod API (AirDef fork): full-screen post pass for mods +Subject: [PATCH 03/33] Mod API (AirDef fork): full-screen post pass for mods render.set-post compiles a mod's WGSL after a prelude (camera matrices, time, 256 vec4 of params, the world's colour and depth) and runs it after diff --git a/horizon-patches/0004-Mod-models-draw-far-models-as-scaled-impostors-past-.patch b/horizon-patches/0004-Mod-models-draw-far-models-as-scaled-impostors-past-.patch index 1172587..1e4d5ca 100644 --- a/horizon-patches/0004-Mod-models-draw-far-models-as-scaled-impostors-past-.patch +++ b/horizon-patches/0004-Mod-models-draw-far-models-as-scaled-impostors-past-.patch @@ -1,7 +1,7 @@ From 2b137dbbedd540daeebc7f5e387847aeb56a1355 Mon Sep 17 00:00:00 2001 From: chexit Date: Wed, 28 Oct 2026 22:09:30 +0300 -Subject: [PATCH 04/32] Mod models: draw far models as scaled impostors past +Subject: [PATCH 04/33] Mod models: draw far models as scaled impostors past the far plane, cull at 4096 --- diff --git a/horizon-patches/0005-Mod-cameras-render.set-views-draws-the-world-from-ot.patch b/horizon-patches/0005-Mod-cameras-render.set-views-draws-the-world-from-ot.patch index af0c93f..55a80df 100644 --- a/horizon-patches/0005-Mod-cameras-render.set-views-draws-the-world-from-ot.patch +++ b/horizon-patches/0005-Mod-cameras-render.set-views-draws-the-world-from-ot.patch @@ -1,7 +1,7 @@ From c8ebca6e0af68630e65211844b34d25c5b985c03 Mon Sep 17 00:00:00 2001 From: chexit Date: Wed, 28 Oct 2026 22:31:00 +0300 -Subject: [PATCH 05/32] Mod cameras: render.set-views draws the world from +Subject: [PATCH 05/33] Mod cameras: render.set-views draws the world from other points into pictures that HUD view shapes show (API level 9) Co-Authored-By: Claude Opus 5.5 diff --git a/horizon-patches/0006-Mods-more-fuel-per-tick-and-per-event-AirDef-plans-r.patch b/horizon-patches/0006-Mods-more-fuel-per-tick-and-per-event-AirDef-plans-r.patch index b914c48..a77c4e9 100644 --- a/horizon-patches/0006-Mods-more-fuel-per-tick-and-per-event-AirDef-plans-r.patch +++ b/horizon-patches/0006-Mods-more-fuel-per-tick-and-per-event-AirDef-plans-r.patch @@ -1,7 +1,7 @@ From 8d2261fc4f8072c32e454139cfea7a8c0cd9d664 Mon Sep 17 00:00:00 2001 From: chexit Date: Wed, 28 Oct 2026 23:08:21 +0300 -Subject: [PATCH 06/32] Mods: more fuel per tick and per event (AirDef plans +Subject: [PATCH 06/33] Mods: more fuel per tick and per event (AirDef plans raids) Co-Authored-By: Claude Opus 5.5 diff --git a/horizon-patches/0007-Mod-cameras-up-to-1920x1080-full-screen-replays.patch b/horizon-patches/0007-Mod-cameras-up-to-1920x1080-full-screen-replays.patch index 5952089..f2c2611 100644 --- a/horizon-patches/0007-Mod-cameras-up-to-1920x1080-full-screen-replays.patch +++ b/horizon-patches/0007-Mod-cameras-up-to-1920x1080-full-screen-replays.patch @@ -1,7 +1,7 @@ From 6c548de34def8e4a624d734243418090798bd16a Mon Sep 17 00:00:00 2001 From: chexit Date: Wed, 28 Oct 2026 23:25:29 +0300 -Subject: [PATCH 07/32] Mod cameras up to 1920x1080 (full-screen replays) +Subject: [PATCH 07/33] Mod cameras up to 1920x1080 (full-screen replays) Co-Authored-By: Claude Opus 5.5 --- diff --git a/horizon-patches/0008-Mod-cameras-distant-terrain-tiles-fog-measured-from-.patch b/horizon-patches/0008-Mod-cameras-distant-terrain-tiles-fog-measured-from-.patch index 6ebc193..e1f1715 100644 --- a/horizon-patches/0008-Mod-cameras-distant-terrain-tiles-fog-measured-from-.patch +++ b/horizon-patches/0008-Mod-cameras-distant-terrain-tiles-fog-measured-from-.patch @@ -1,7 +1,7 @@ From 9b9e93269d67401cc620567a884d5ce97f68d76e Mon Sep 17 00:00:00 2001 From: chexit Date: Thu, 29 Oct 2026 11:15:11 +0300 -Subject: [PATCH 08/32] Mod cameras: distant terrain tiles, fog measured from +Subject: [PATCH 08/33] Mod cameras: distant terrain tiles, fog measured from the camera, no impostors while one is shown Co-Authored-By: Claude Opus 5.5 diff --git a/horizon-patches/0009-Mods-game.world-id-so-mods-keep-state-per-world-API-.patch b/horizon-patches/0009-Mods-game.world-id-so-mods-keep-state-per-world-API-.patch index 9884387..b2e050f 100644 --- a/horizon-patches/0009-Mods-game.world-id-so-mods-keep-state-per-world-API-.patch +++ b/horizon-patches/0009-Mods-game.world-id-so-mods-keep-state-per-world-API-.patch @@ -1,7 +1,7 @@ From 065d9fa02966238a5bd9ff460392a1a809db0b11 Mon Sep 17 00:00:00 2001 From: chexit Date: Thu, 29 Oct 2026 11:25:45 +0300 -Subject: [PATCH 09/32] Mods: game.world-id, so mods keep state per world (API +Subject: [PATCH 09/33] Mods: game.world-id, so mods keep state per world (API level 9) Co-Authored-By: Claude Opus 5.5 diff --git a/horizon-patches/0010-cargo-horizon-mod-trial-runs-behind-feature-full-so-.patch b/horizon-patches/0010-cargo-horizon-mod-trial-runs-behind-feature-full-so-.patch index ddb8df6..400a78f 100644 --- a/horizon-patches/0010-cargo-horizon-mod-trial-runs-behind-feature-full-so-.patch +++ b/horizon-patches/0010-cargo-horizon-mod-trial-runs-behind-feature-full-so-.patch @@ -1,7 +1,7 @@ From 1bf28135fd9a31f837323dc3a8d81ed73343d816 Mon Sep 17 00:00:00 2001 From: chexit Date: Thu, 29 Oct 2026 12:01:08 +0300 -Subject: [PATCH 10/32] cargo-horizon-mod: trial runs behind feature full, so a +Subject: [PATCH 10/33] cargo-horizon-mod: trial runs behind feature full, so a packing-only tool skips wasmtime Co-Authored-By: Claude Opus 5.5 diff --git a/horizon-patches/0011-HD-lighting-G-buffer-pass-per-pixel-mod-point-lights.patch b/horizon-patches/0011-HD-lighting-G-buffer-pass-per-pixel-mod-point-lights.patch index 239dd31..61fbb5b 100644 --- a/horizon-patches/0011-HD-lighting-G-buffer-pass-per-pixel-mod-point-lights.patch +++ b/horizon-patches/0011-HD-lighting-G-buffer-pass-per-pixel-mod-point-lights.patch @@ -1,7 +1,7 @@ From 0a56f5616df4699588cbcc529d4720661baa810f Mon Sep 17 00:00:00 2001 From: chexit Date: Thu, 29 Oct 2026 13:18:43 +0300 -Subject: [PATCH 11/32] HD lighting: G-buffer pass, per-pixel mod point lights +Subject: [PATCH 11/33] HD lighting: G-buffer pass, per-pixel mod point lights in HDR, bloom and tone curve; render.set-lights and render.set-lighting (API level 10) diff --git a/horizon-patches/0012-HD-lighting-stage-2-sun-and-moon-shadow-cascades-the.patch b/horizon-patches/0012-HD-lighting-stage-2-sun-and-moon-shadow-cascades-the.patch index 0c66c6e..52cae11 100644 --- a/horizon-patches/0012-HD-lighting-stage-2-sun-and-moon-shadow-cascades-the.patch +++ b/horizon-patches/0012-HD-lighting-stage-2-sun-and-moon-shadow-cascades-the.patch @@ -1,7 +1,7 @@ From 9ebf0031fe9ba6b7f02afb26e4fd3a1ba4ddb0d0 Mon Sep 17 00:00:00 2001 From: chexit Date: Thu, 29 Oct 2026 13:59:43 +0300 -Subject: [PATCH 12/32] HD lighting stage 2: sun and moon shadow cascades, the +Subject: [PATCH 12/33] HD lighting stage 2: sun and moon shadow cascades, the world relit (sun by face angle and shadow, sky and block light through the lightmap), light shafts and halos, fog over it again, a light colour grade diff --git a/horizon-patches/0013-HD-bind-groups-cached-until-a-resize-or-a-new-source.patch b/horizon-patches/0013-HD-bind-groups-cached-until-a-resize-or-a-new-source.patch index e943874..962bd6e 100644 --- a/horizon-patches/0013-HD-bind-groups-cached-until-a-resize-or-a-new-source.patch +++ b/horizon-patches/0013-HD-bind-groups-cached-until-a-resize-or-a-new-source.patch @@ -1,7 +1,7 @@ From 7a5a38f68923aec62f10bfa0df50b436474ed612 Mon Sep 17 00:00:00 2001 From: chexit Date: Thu, 29 Oct 2026 16:19:53 +0300 -Subject: [PATCH 13/32] HD: bind groups cached until a resize or a new source, +Subject: [PATCH 13/33] HD: bind groups cached until a resize or a new source, shadow passes draw only the entities that cast shadows Co-Authored-By: Claude Opus 5.5 diff --git a/horizon-patches/0014-HD-lights-culled-per-16x16-tile-surface-and-halo-lis.patch b/horizon-patches/0014-HD-lights-culled-per-16x16-tile-surface-and-halo-lis.patch index 81283f3..0509ea3 100644 --- a/horizon-patches/0014-HD-lights-culled-per-16x16-tile-surface-and-halo-lis.patch +++ b/horizon-patches/0014-HD-lights-culled-per-16x16-tile-surface-and-halo-lis.patch @@ -1,7 +1,7 @@ From 8020811e57d4b5a9ea1cd72d30ce859dc5095d35 Mon Sep 17 00:00:00 2001 From: chexit Date: Thu, 29 Oct 2026 16:25:44 +0300 -Subject: [PATCH 14/32] HD: lights culled per 16x16 tile (surface and halo +Subject: [PATCH 14/33] HD: lights culled per 16x16 tile (surface and halo lists built on the CPU), a naga test for the lighting shaders Co-Authored-By: Claude Opus 5.5 diff --git a/horizon-patches/0015-HD-GPU-time-per-pass-in-the-F3-timing-list-half-reso.patch b/horizon-patches/0015-HD-GPU-time-per-pass-in-the-F3-timing-list-half-reso.patch index 3ac7a76..c36b974 100644 --- a/horizon-patches/0015-HD-GPU-time-per-pass-in-the-F3-timing-list-half-reso.patch +++ b/horizon-patches/0015-HD-GPU-time-per-pass-in-the-F3-timing-list-half-reso.patch @@ -1,7 +1,7 @@ From 72d3fddfea329e578162656151350f0aa2efd323 Mon Sep 17 00:00:00 2001 From: chexit Date: Thu, 29 Oct 2026 16:43:36 +0300 -Subject: [PATCH 15/32] HD: GPU time per pass in the F3 timing list, +Subject: [PATCH 15/33] HD: GPU time per pass in the F3 timing list, half-resolution GTAO with a depth-aware blur Co-Authored-By: Claude Opus 5.5 diff --git a/horizon-patches/0016-HD-shadows-draw-only-sun-facing-quads-and-skip-burie.patch b/horizon-patches/0016-HD-shadows-draw-only-sun-facing-quads-and-skip-burie.patch index f2e96d9..2448519 100644 --- a/horizon-patches/0016-HD-shadows-draw-only-sun-facing-quads-and-skip-burie.patch +++ b/horizon-patches/0016-HD-shadows-draw-only-sun-facing-quads-and-skip-burie.patch @@ -1,7 +1,7 @@ From 1fd83a821bf270879d8ece5aa583f200ed920d89 Mon Sep 17 00:00:00 2001 From: chexit Date: Thu, 29 Oct 2026 17:02:02 +0300 -Subject: [PATCH 16/32] HD: shadows draw only sun-facing quads and skip buried +Subject: [PATCH 16/33] HD: shadows draw only sun-facing quads and skip buried sections, the far cascade every second frame; TAA (Halton jitter, reprojection by depth, YCoCg variance clipping) before bloom diff --git a/horizon-patches/0017-Mods-model-handles-render.model-id-model-generation-.patch b/horizon-patches/0017-Mods-model-handles-render.model-id-model-generation-.patch index 22a77f5..5521ce7 100644 --- a/horizon-patches/0017-Mods-model-handles-render.model-id-model-generation-.patch +++ b/horizon-patches/0017-Mods-model-handles-render.model-id-model-generation-.patch @@ -1,7 +1,7 @@ From 1502d359d599228fe0f44ce6b99a3fded2ac5ea0 Mon Sep 17 00:00:00 2001 From: chexit Date: Thu, 29 Oct 2026 17:02:02 +0300 -Subject: [PATCH 17/32] Mods: model handles (render.model-id, model-generation, +Subject: [PATCH 17/33] Mods: model handles (render.model-id, model-generation, set-models-by-id; API level 11) so mods send no model names each tick; clear-post and set-lighting documented diff --git a/horizon-patches/0018-HD-temporal-upscaling-HORIZON_HD_SCALE-world-G-buffe.patch b/horizon-patches/0018-HD-temporal-upscaling-HORIZON_HD_SCALE-world-G-buffe.patch index 3ff7869..4844f67 100644 --- a/horizon-patches/0018-HD-temporal-upscaling-HORIZON_HD_SCALE-world-G-buffe.patch +++ b/horizon-patches/0018-HD-temporal-upscaling-HORIZON_HD_SCALE-world-G-buffe.patch @@ -1,7 +1,7 @@ From 0f9d99b8ad3e4b72e621d84c2396cf1d3d2b7a33 Mon Sep 17 00:00:00 2001 From: chexit Date: Thu, 29 Oct 2026 17:19:57 +0300 -Subject: [PATCH 18/32] HD: temporal upscaling (HORIZON_HD_SCALE: world, +Subject: [PATCH 18/33] HD: temporal upscaling (HORIZON_HD_SCALE: world, G-buffer and lighting at a lower size, rebuilt to the window in the TAA pass); fix flickering shadows near the player (the near cascade lost its sections on frames the far one was held, the held far matrix ignored the diff --git a/horizon-patches/0019-HD-water-its-own-pass-colour-normal-depth-the-floor-.patch b/horizon-patches/0019-HD-water-its-own-pass-colour-normal-depth-the-floor-.patch index c21fc56..e00f60d 100644 --- a/horizon-patches/0019-HD-water-its-own-pass-colour-normal-depth-the-floor-.patch +++ b/horizon-patches/0019-HD-water-its-own-pass-colour-normal-depth-the-floor-.patch @@ -1,7 +1,7 @@ From 38250c4392e27d5700842ca6ee47291dd1831b72 Mon Sep 17 00:00:00 2001 From: chexit Date: Thu, 29 Oct 2026 17:47:52 +0300 -Subject: [PATCH 19/32] HD water: its own pass (colour, normal, depth), the +Subject: [PATCH 19/33] HD water: its own pass (colour, normal, depth), the floor under it lit, a composite with world-space waves, refraction with depth absorption in the biome colour, screen-space reflections, Fresnel and a shadowed sun glint (HORIZON_HD_WATER=0 to switch off) diff --git a/horizon-patches/0020-HD-water-no-vanilla-texture-on-the-surface-the-biome.patch b/horizon-patches/0020-HD-water-no-vanilla-texture-on-the-surface-the-biome.patch index a439723..73711b0 100644 --- a/horizon-patches/0020-HD-water-no-vanilla-texture-on-the-surface-the-biome.patch +++ b/horizon-patches/0020-HD-water-no-vanilla-texture-on-the-surface-the-biome.patch @@ -1,7 +1,7 @@ From dbc6f8a6e9c2eeabe1de15f1794013c90be7faa5 Mon Sep 17 00:00:00 2001 From: chexit Date: Thu, 29 Oct 2026 17:56:04 +0300 -Subject: [PATCH 20/32] HD water: no vanilla texture on the surface (the biome +Subject: [PATCH 20/33] HD water: no vanilla texture on the surface (the biome colour only), a darker, deeper colour Co-Authored-By: Claude Opus 5.5 diff --git a/horizon-patches/0021-HD-sky-and-light-a-physical-atmosphere-Rayleigh-Mie-.patch b/horizon-patches/0021-HD-sky-and-light-a-physical-atmosphere-Rayleigh-Mie-.patch index 8e292e4..1d87f5e 100644 --- a/horizon-patches/0021-HD-sky-and-light-a-physical-atmosphere-Rayleigh-Mie-.patch +++ b/horizon-patches/0021-HD-sky-and-light-a-physical-atmosphere-Rayleigh-Mie-.patch @@ -1,7 +1,7 @@ From 13e74537dd6e63482e3613e0e416de1158944dfe Mon Sep 17 00:00:00 2001 From: chexit Date: Thu, 29 Oct 2026 18:38:19 +0300 -Subject: [PATCH 21/32] HD sky and light: a physical atmosphere (Rayleigh, Mie, +Subject: [PATCH 21/33] HD sky and light: a physical atmosphere (Rayleigh, Mie, ozone; constants and transmittance after Photon, MIT) for the sky, haze, fog and water reflections; warmer sunlight from the atmosphere's transmittance, a gentle sky-coloured ambient, soft PCSS-lite shadows near the player, a haze diff --git a/horizon-patches/0022-HD-water-a-darker-blue-a-little-clearer-ripples-a-li.patch b/horizon-patches/0022-HD-water-a-darker-blue-a-little-clearer-ripples-a-li.patch index 851e6ca..db5c49c 100644 --- a/horizon-patches/0022-HD-water-a-darker-blue-a-little-clearer-ripples-a-li.patch +++ b/horizon-patches/0022-HD-water-a-darker-blue-a-little-clearer-ripples-a-li.patch @@ -1,7 +1,7 @@ From 6277e051a89c2537570982f6ef275887193c05cf Mon Sep 17 00:00:00 2001 From: chexit Date: Thu, 29 Oct 2026 19:02:16 +0300 -Subject: [PATCH 22/32] HD water: a darker blue, a little clearer, ripples a +Subject: [PATCH 22/33] HD water: a darker blue, a little clearer, ripples a little higher Co-Authored-By: Claude Opus 5.5 diff --git a/horizon-patches/0023-HD-Photon-style-sunsets-Rec.-2020-atmosphere-sun-tin.patch b/horizon-patches/0023-HD-Photon-style-sunsets-Rec.-2020-atmosphere-sun-tin.patch index 3e988e3..86b01bd 100644 --- a/horizon-patches/0023-HD-Photon-style-sunsets-Rec.-2020-atmosphere-sun-tin.patch +++ b/horizon-patches/0023-HD-Photon-style-sunsets-Rec.-2020-atmosphere-sun-tin.patch @@ -1,7 +1,7 @@ From 982265d21bb9d74ec0040db03feb5a55762286ad Mon Sep 17 00:00:00 2001 From: chexit Date: Thu, 29 Oct 2026 21:41:48 +0300 -Subject: [PATCH 23/32] HD: Photon-style sunsets (Rec. 2020 atmosphere, sun +Subject: [PATCH 23/33] HD: Photon-style sunsets (Rec. 2020 atmosphere, sun tint, blue hour; MIT), volumetric clouds with ground shadows instead of vanilla's in HD, volumetric fog with sun shafts and morning mist (HORIZON_HD_CLOUDS=0, HORIZON_HD_VOLFOG=0) diff --git a/horizon-patches/0024-Mods-world-queries-for-simulations-render.query-rays.patch b/horizon-patches/0024-Mods-world-queries-for-simulations-render.query-rays.patch index e581726..af1757d 100644 --- a/horizon-patches/0024-Mods-world-queries-for-simulations-render.query-rays.patch +++ b/horizon-patches/0024-Mods-world-queries-for-simulations-render.query-rays.patch @@ -1,7 +1,7 @@ From 24971b3c67d8c87673eb2e0d204cedf8a2f46d1c Mon Sep 17 00:00:00 2001 From: chexit Date: Thu, 29 Oct 2026 21:43:22 +0300 -Subject: [PATCH 24/32] Mods: world queries for simulations (render.query-rays, +Subject: [PATCH 24/33] Mods: world queries for simulations (render.query-rays, query-sections, world-changes; API level 12): block-exact rays and section occupancy by collision, sight or sound, answered next tick within budgets, and a log of changed sections diff --git a/horizon-patches/0025-HD-fixes-rain-level-from-the-world-not-from-rain-geo.patch b/horizon-patches/0025-HD-fixes-rain-level-from-the-world-not-from-rain-geo.patch index 95364bf..49e71b2 100644 --- a/horizon-patches/0025-HD-fixes-rain-level-from-the-world-not-from-rain-geo.patch +++ b/horizon-patches/0025-HD-fixes-rain-level-from-the-world-not-from-rain-geo.patch @@ -1,7 +1,7 @@ From fdec4960983bdff82f3793460f9a5234f0cd3f49 Mon Sep 17 00:00:00 2001 From: chexit Date: Thu, 29 Oct 2026 22:56:15 +0300 -Subject: [PATCH 25/32] HD fixes: rain level from the world not from rain +Subject: [PATCH 25/33] HD fixes: rain level from the world not from rain geometry (#41), TAA history on the jittered grid (#38), vanilla cloud tint without a depth heuristic (#35), air fog once over water (#37), translucent things in front of HD water (#36), cheaper sunrise fan (#39), halos in thick diff --git a/horizon-patches/0026-HD-split-into-modules-gfx-hd-one-Rust-file-and-one-W.patch b/horizon-patches/0026-HD-split-into-modules-gfx-hd-one-Rust-file-and-one-W.patch index 9632aac..615f5c4 100644 --- a/horizon-patches/0026-HD-split-into-modules-gfx-hd-one-Rust-file-and-one-W.patch +++ b/horizon-patches/0026-HD-split-into-modules-gfx-hd-one-Rust-file-and-one-W.patch @@ -1,7 +1,7 @@ From 21391afb26f49505d6cdaf454a6355cd4e747503 Mon Sep 17 00:00:00 2001 From: chexit Date: Thu, 29 Oct 2026 23:19:53 +0300 -Subject: [PATCH 26/32] HD split into modules (gfx/hd/: one Rust file and one +Subject: [PATCH 26/33] HD split into modules (gfx/hd/: one Rust file and one WGSL file per pass, a shared prelude), contracts for colour, depth, alpha, time and coordinates written down, tests that the frame layout and bindings match between Rust and WGSL (#45) diff --git a/horizon-patches/0027-HD-clouds-noise-scales-that-divide-the-camera-s-6553.patch b/horizon-patches/0027-HD-clouds-noise-scales-that-divide-the-camera-s-6553.patch index d3ee3a8..825c131 100644 --- a/horizon-patches/0027-HD-clouds-noise-scales-that-divide-the-camera-s-6553.patch +++ b/horizon-patches/0027-HD-clouds-noise-scales-that-divide-the-camera-s-6553.patch @@ -1,7 +1,7 @@ From 8d4cadbf8534309ac847d34e229f6d764770475d Mon Sep 17 00:00:00 2001 From: chexit Date: Thu, 29 Oct 2026 23:22:19 +0300 -Subject: [PATCH 27/32] HD clouds: noise scales that divide the camera's +Subject: [PATCH 27/33] HD clouds: noise scales that divide the camera's 65536-block wrap, so the clouds and their shadows no longer jump at x or z = 0 diff --git a/horizon-patches/0028-HD-volumetric-smoke-and-missile-trails-with-clear-tu.patch b/horizon-patches/0028-HD-volumetric-smoke-and-missile-trails-with-clear-tu.patch index 2c5bcc3..8c5788a 100644 --- a/horizon-patches/0028-HD-volumetric-smoke-and-missile-trails-with-clear-tu.patch +++ b/horizon-patches/0028-HD-volumetric-smoke-and-missile-trails-with-clear-tu.patch @@ -1,7 +1,7 @@ From 0fb59c782abf269fe555faa3241b31acf41e26d7 Mon Sep 17 00:00:00 2001 From: chexit Date: Fri, 30 Oct 2026 03:17:11 +0300 -Subject: [PATCH 28/32] HD: volumetric smoke and missile trails with clear +Subject: [PATCH 28/33] HD: volumetric smoke and missile trails with clear tunnels through fog and cloud (render.set-smoke, API level 14; #54); sun speculars by material, wet surfaces and puddles in rain, wind in foliage (HORIZON_HD_SPECULAR=0, HORIZON_HD_WIND=0, HORIZON_HD_SMOKE=0); HD shaders diff --git a/horizon-patches/0029-HD-clouds-composited-by-depth-so-terrain-and-vehicle.patch b/horizon-patches/0029-HD-clouds-composited-by-depth-so-terrain-and-vehicle.patch index 6f9ce07..1d504ea 100644 --- a/horizon-patches/0029-HD-clouds-composited-by-depth-so-terrain-and-vehicle.patch +++ b/horizon-patches/0029-HD-clouds-composited-by-depth-so-terrain-and-vehicle.patch @@ -1,7 +1,7 @@ From e4bc29da45d0d38244c6eb2ba3ffb9ab853540c0 Mon Sep 17 00:00:00 2001 From: chexit Date: Fri, 30 Oct 2026 03:26:09 +0300 -Subject: [PATCH 29/32] HD clouds composited by depth so terrain and vehicles +Subject: [PATCH 29/33] HD clouds composited by depth so terrain and vehicles inside or behind the layer are hidden and those in front stay in front (#67); world-anchored noise everywhere (cloud detail by height above the layer, fog, smoke and puddle scales dividing the wrap) (#68); the replay's time is visual diff --git a/horizon-patches/0030-HD-smoke-young-trails-drawn-at-least-as-wide-as-a-gr.patch b/horizon-patches/0030-HD-smoke-young-trails-drawn-at-least-as-wide-as-a-gr.patch index 88b1dd3..32d5d26 100644 --- a/horizon-patches/0030-HD-smoke-young-trails-drawn-at-least-as-wide-as-a-gr.patch +++ b/horizon-patches/0030-HD-smoke-young-trails-drawn-at-least-as-wide-as-a-gr.patch @@ -1,7 +1,7 @@ From 20f699796afb12b600236a4e8859cd97430f86f0 Mon Sep 17 00:00:00 2001 From: chexit Date: Fri, 30 Oct 2026 03:44:45 +0300 -Subject: [PATCH 30/32] HD smoke: young trails drawn at least as wide as a grid +Subject: [PATCH 30/33] HD smoke: young trails drawn at least as wide as a grid cell (density scaled to keep the mass), gentler bulges, so a trail is a smooth ribbon and not a chain of puffs diff --git a/horizon-patches/0031-Mods-render.set-main-view-API-level-15-renders-the-s.patch b/horizon-patches/0031-Mods-render.set-main-view-API-level-15-renders-the-s.patch index fceb1a0..8cc313b 100644 --- a/horizon-patches/0031-Mods-render.set-main-view-API-level-15-renders-the-s.patch +++ b/horizon-patches/0031-Mods-render.set-main-view-API-level-15-renders-the-s.patch @@ -1,7 +1,7 @@ From 35ffbaa26dd91855c8b93446646ba8c58448d3d0 Mon Sep 17 00:00:00 2001 From: chexit Date: Fri, 30 Oct 2026 03:59:41 +0300 -Subject: [PATCH 31/32] Mods: render.set-main-view (API level 15) renders the +Subject: [PATCH 31/33] Mods: render.set-main-view (API level 15) renders the screen's world from a mod camera with the full pipeline, so replays get HD and the post effects; small mod views get the post pass with their own camera diff --git a/horizon-patches/0032-Spot-lights-for-mods-render.set-spot-lights-API-leve.patch b/horizon-patches/0032-Spot-lights-for-mods-render.set-spot-lights-API-leve.patch index 380ad81..4131676 100644 --- a/horizon-patches/0032-Spot-lights-for-mods-render.set-spot-lights-API-leve.patch +++ b/horizon-patches/0032-Spot-lights-for-mods-render.set-spot-lights-API-leve.patch @@ -1,7 +1,7 @@ From 27e24527550942695164dd3a769a42a659e797ca Mon Sep 17 00:00:00 2001 From: chexit Date: Fri, 30 Oct 2026 09:28:05 +0300 -Subject: [PATCH 32/32] Spot lights for mods (render.set-spot-lights, API level +Subject: [PATCH 32/33] Spot lights for mods (render.set-spot-lights, API level 16): surfaces lit in the cone, a volumetric beam stopped by depth (#60); film capture (render.capture-*, set-film-quality, API level 17): fixed-step clock, frames piped to ffmpeg or PNGs, offline audio, no chat in the frames (#58); diff --git a/horizon-patches/0033-HD-clouds-and-fog-polish-cloud-panorama-cirrus-terra.patch b/horizon-patches/0033-HD-clouds-and-fog-polish-cloud-panorama-cirrus-terra.patch new file mode 100644 index 0000000..c220c10 --- /dev/null +++ b/horizon-patches/0033-HD-clouds-and-fog-polish-cloud-panorama-cirrus-terra.patch @@ -0,0 +1,2994 @@ +From 615f5c3fa7c19a9895f8972a88333c6f250ad78a Mon Sep 17 00:00:00 2001 +From: chexit +Date: Fri, 30 Oct 2026 14:30:39 +0300 +Subject: [PATCH 33/33] HD clouds and fog polish: cloud panorama, cirrus, + terrain-aware fog, far smoke cascade; replay world log and film clock; + material overlays by sprite name + +Co-Authored-By: Claude Opus 5.5 +--- + crates/horizon-client/src/film_clock.rs | 45 +++ + crates/horizon-client/src/game.rs | 11 + + crates/horizon-client/src/game/film.rs | 17 + + crates/horizon-client/src/game/mod_models.rs | 42 +- + crates/horizon-client/src/game/mods.rs | 60 +++ + crates/horizon-client/src/gfx.rs | 5 + + .../src/gfx/THIRD_PARTY_PHOTON.md | 2 +- + crates/horizon-client/src/gfx/hd/cloud.wgsl | 233 +++++++---- + .../src/gfx/hd/cloud_shadow.wgsl | 17 +- + crates/horizon-client/src/gfx/hd/fog.wgsl | 86 +++- + crates/horizon-client/src/gfx/hd/frame.rs | 4 +- + crates/horizon-client/src/gfx/hd/ground.rs | 208 ++++++++++ + crates/horizon-client/src/gfx/hd/light.wgsl | 26 +- + crates/horizon-client/src/gfx/hd/lighting.rs | 4 +- + crates/horizon-client/src/gfx/hd/materials.rs | 2 +- + crates/horizon-client/src/gfx/hd/mod.rs | 18 +- + .../horizon-client/src/gfx/hd/pano_funcs.wgsl | 18 + + crates/horizon-client/src/gfx/hd/prelude.wgsl | 1 + + crates/horizon-client/src/gfx/hd/sky.rs | 3 + + crates/horizon-client/src/gfx/hd/smoke.rs | 304 +++++++++----- + .../horizon-client/src/gfx/hd/smoke_grid.wgsl | 6 +- + .../src/gfx/hd/smoke_sample.wgsl | 29 ++ + crates/horizon-client/src/gfx/hd/volumes.rs | 144 ++++++- + crates/horizon-client/src/gfx/hd/water.rs | 21 +- + crates/horizon-client/src/gfx/hd/water.wgsl | 3 +- + crates/horizon-client/src/gfx/mod_post.rs | 2 +- + crates/horizon-client/src/gfx/native_post.rs | 2 +- + .../horizon-client/src/gfx/pack_uniforms.rs | 2 +- + crates/horizon-client/src/lib.rs | 2 + + crates/horizon-client/src/world.rs | 129 ++++-- + crates/horizon-client/src/world_log.rs | 372 ++++++++++++++++++ + crates/horizon-mod-sdk/wit/horizon.wit | 26 ++ + crates/horizon-mods/src/api_level.rs | 9 +- + crates/horizon-mods/src/runtime.rs | 50 +++ + docs/api/mods-reference.md | 4 + + 35 files changed, 1657 insertions(+), 250 deletions(-) + create mode 100644 crates/horizon-client/src/film_clock.rs + create mode 100644 crates/horizon-client/src/gfx/hd/ground.rs + create mode 100644 crates/horizon-client/src/gfx/hd/pano_funcs.wgsl + create mode 100644 crates/horizon-client/src/world_log.rs + +diff --git a/crates/horizon-client/src/film_clock.rs b/crates/horizon-client/src/film_clock.rs +new file mode 100644 +index 000000000..6396e4c1f +--- /dev/null ++++ b/crates/horizon-client/src/film_clock.rs +@@ -0,0 +1,45 @@ ++//! AirDef fork: the clock of animations that run on wall time (clouds, water, wind, post-pass ++//! time, smoothing steps). While a film is captured the game's frames are not real time (each ++//! takes as long as it takes to render, and a 120 fps film has twice the frames of a 60 fps one ++//! in the same film second), so these animations read this clock instead: it stands at the ++//! film's own time, `1 / fps` further each frame, and is the real clock the rest of the time. ++use std::sync::Mutex; ++use std::time::{Duration, Instant}; ++ ++static FILM: Mutex> = Mutex::new(None); ++ ++/// The film's moment (frozen for the frame), or None to run on real time again. ++pub fn set(now: Option) { ++ if let Ok(mut f) = FILM.lock() { ++ *f = now; ++ } ++} ++ ++/// What the animations take as now. ++pub fn now() -> Instant { ++ FILM.lock() ++ .ok() ++ .and_then(|f| *f) ++ .unwrap_or_else(Instant::now) ++} ++ ++/// Time since `start` on this clock. ++pub fn since(start: Instant) -> Duration { ++ now().saturating_duration_since(start) ++} ++ ++#[cfg(test)] ++mod tests { ++ use super::*; ++ ++ #[test] ++ fn film_time_is_the_frames_not_the_wall() { ++ let origin = Instant::now(); ++ set(Some(origin + Duration::from_millis(50))); ++ assert_eq!(since(origin), Duration::from_millis(50)); ++ std::thread::sleep(Duration::from_millis(5)); ++ assert_eq!(since(origin), Duration::from_millis(50)); ++ set(None); ++ assert!(since(origin) >= Duration::from_millis(5)); ++ } ++} +diff --git a/crates/horizon-client/src/game.rs b/crates/horizon-client/src/game.rs +index bace52193..3f776fd3f 100644 +--- a/crates/horizon-client/src/game.rs ++++ b/crates/horizon-client/src/game.rs +@@ -11881,7 +11881,17 @@ impl Game<'_> { + let hd_lights = self.mod_lights(camera, alpha); + let hd_spots = self.mod_spots(camera, alpha); + let (hd_smoke, hd_smoke_clock) = self.mod_smoke(camera, alpha); ++ // AirDef fork: HD's fog reads the ground's height round the camera. ++ let hd_ground = |x: i32, z: i32| { ++ self.world ++ .world_surface(x, z, |s| self.res.facts().is_air(s)) ++ }; + let frame = Frame { ++ hd_ground: if self.mod_hd().is_some() { ++ Some(&hd_ground) ++ } else { ++ None ++ }, + mod_views: &mod_views, + hd: self.mod_hd(), + hd_lights: &hd_lights, +@@ -14828,6 +14838,7 @@ fn loading_frame(hud: &HudBatch) -> Frame<'_> { + hd_spots: &[], + hd_smoke: &[], + hd_smoke_clock: 0.0, ++ hd_ground: None, + weather: &[], + weather_time: horizon_client::weather::Time::new(0, 0.0), + camera: glam::DVec3::new(0.5, 100.0, 0.5), +diff --git a/crates/horizon-client/src/game/film.rs b/crates/horizon-client/src/game/film.rs +index 8d1995030..2ae449fc5 100644 +--- a/crates/horizon-client/src/game/film.rs ++++ b/crates/horizon-client/src/game/film.rs +@@ -96,6 +96,8 @@ pub(super) struct Film { + view: Option, + /// Audio frames mixed so far. + mixed: u64, ++ /// Where the film's own clock (`film_clock`) began: real time at the first frame. ++ origin: std::time::Instant, + /// Told to stop (cancel or not) and what the writer is finishing. + cancel: bool, + note: String, +@@ -476,6 +478,10 @@ impl Game<'_> { + let n = film.stepped; + film.stepped += 1; + let at = |k: u64| (k * 1_000_000_000 + fps / 2) / fps; ++ // Animations on wall time follow the film's frames, not the machine's speed. ++ horizon_client::film_clock::set(Some( ++ film.origin + Duration::from_nanos(at(n + 1)), ++ )); + Duration::from_nanos(at(n + 1) - at(n)) + } + _ => real, +@@ -535,6 +541,14 @@ impl Game<'_> { + }; + } + } ++ if self ++ .film ++ .film ++ .as_ref() ++ .is_none_or(|f| f.phase != Phase::Recording) ++ { ++ horizon_client::film_clock::set(None); ++ } + // Film quality: a capture needs it; otherwise it is the mods' choice. + let want = self.film.film.is_some() || self.mods_film_quality(); + horizon_client::gfx::set_film_quality(want); +@@ -585,6 +599,7 @@ impl Game<'_> { + thread: None, + view: None, + mixed: 0, ++ origin: std::time::Instant::now(), + cancel: false, + note: String::new(), + }) +@@ -643,6 +658,8 @@ impl Game<'_> { + film.sink = Some(tx); + film.phase = Phase::Recording; + film.stepped = 0; ++ film.origin = std::time::Instant::now(); ++ horizon_client::film_clock::set(Some(film.origin)); + if film.req.audio { + self.audio.film_begin(); + } +diff --git a/crates/horizon-client/src/game/mod_models.rs b/crates/horizon-client/src/game/mod_models.rs +index 9367bb994..78ee8448b 100644 +--- a/crates/horizon-client/src/game/mod_models.rs ++++ b/crates/horizon-client/src/game/mod_models.rs +@@ -53,7 +53,6 @@ const MODEL_GLOW: u32 = 40; + const MODEL_PAINTED: u32 = 41; + /// Bare metal: smooth and fully metallic (entity.wgsl's fs_entity_gbuffer). + #[cfg(feature = "mods")] +-#[allow(dead_code)] + const MODEL_BARE_METAL: u32 = 42; + /// Full brightness: sky and block light 15, as the entity shader packs them. + #[cfg(feature = "mods")] +@@ -330,8 +329,8 @@ impl Game<'_> { + let a = DVec3::new(s.ax, s.ay, s.az) - camera; + let b = DVec3::new(s.bx, s.by, s.bz) - camera; + let near = a.length().min(b.length()); +- // Far past the grid, nothing of it can show. +- if near > 600.0 { ++ // Far past the far grid (768 blocks), nothing of it can show. ++ if near > 900.0 { + return None; + } + let seed = (s.id.wrapping_mul(2_654_435_761) >> 8) as f32 / 16_777_216.0; +@@ -347,7 +346,7 @@ impl Game<'_> { + }) + .collect(); + out.sort_by(|x, y| x.0.total_cmp(&y.0)); +- out.truncate(3072); ++ out.truncate(8192); + ( + out.into_iter().map(|(_, s)| s).collect(), + clock.rem_euclid(86_400.0 * 20.0) as f32 / 20.0, +@@ -399,6 +398,25 @@ impl Game<'_> { + let reach = depth_far * 0.85; + // A mod camera (a replay's, a system's) must see them where they are: no impostors then. + let impostors = self.mods.models.views.is_empty(); ++ // Sprites a model asks a material of by name: `glow_*` glows (40), `bare_*` and `glass_*` ++ // are bare metal / glass (42); the rest is painted (41). Matched by atlas rectangle below. ++ let special: Vec<([f32; 4], u32)> = self ++ .gui ++ .atlas ++ .sprites ++ .iter() ++ .filter_map(|(n, r)| { ++ let f = n.rsplit('/').next()?; ++ let m = if f.starts_with("glow_") { ++ MODEL_GLOW ++ } else if f.starts_with("bare_") || f.starts_with("glass_") { ++ MODEL_BARE_METAL ++ } else { ++ return None; ++ }; ++ Some(([r.u0, r.v0, r.u1, r.v1], m)) ++ }) ++ .collect(); + for p in self.mods.models.poses.values() { + let mut at = p.previous.lerp(p.position, t); + let d = at.distance(camera); +@@ -439,6 +457,22 @@ impl Game<'_> { + for v in &mut out[start..] { + v.layer = if p.glow { MODEL_GLOW } else { MODEL_PAINTED }; + } ++ if !p.glow { ++ // A quad takes its material from the sprite under its centre (the corners may touch a neighbour). ++ for q in out[start..].chunks_mut(4) { ++ let n = q.len() as f32; ++ let u = q.iter().map(|v| v.uv[0]).sum::() / n; ++ let w = q.iter().map(|v| v.uv[1]).sum::() / n; ++ if let Some((_, m)) = special.iter().find(|(r, _)| u > r[0] && u < r[2] && w > r[1] && w < r[3]) { ++ for v in q { ++ v.layer = *m; ++ if *m == MODEL_GLOW { ++ v.light = GLOW; ++ } ++ } ++ } ++ } ++ } + } + } + +diff --git a/crates/horizon-client/src/game/mods.rs b/crates/horizon-client/src/game/mods.rs +index 6623905f0..b4d332f41 100644 +--- a/crates/horizon-client/src/game/mods.rs ++++ b/crates/horizon-client/src/game/mods.rs +@@ -280,6 +280,7 @@ impl Game<'_> { + pub(super) fn sync_mods(&mut self) {} + pub(super) fn tick_mods(&mut self) {} + pub(super) fn mods_frame(&mut self, _elapsed: Duration) {} ++ pub(super) fn sync_world_log(&mut self) {} + pub(super) fn mods_film_requests( + &mut self, + ) -> (Option, Option) { +@@ -716,6 +717,7 @@ impl Game<'_> { + } + pub(super) fn mods_frame(&mut self, elapsed: Duration) { + self.reload_dev_mods(); ++ self.sync_world_log(); + if !self.mods.mods.is_running() { + return; + } +@@ -727,6 +729,64 @@ impl Game<'_> { + self.mods.mods.frame(elapsed.as_secs_f32()); + self.show_mod_output(); + } ++ /// AirDef fork: the block-change log a mod asked for (`render.world-log-start`), what it ++ /// covers, and the mod's view of the world at an earlier tick (`set-world-time-view`), ++ /// moved on a little each frame (all at once while a film is recorded: its frames are not ++ /// real time). Only where the world is a server's copy: with the world run in the frame ++ /// the blocks are the game's own and are never shown other than they are. ++ pub(super) fn sync_world_log(&mut self) { ++ use horizon_client::world_log::WorldLog; ++ self.world.log_tick = self.ticks; ++ let wanted = if self.remote.is_some() { ++ self.mods.mods.world_log_wanted() ++ } else { ++ None ++ }; ++ match wanted { ++ Some(id) => { ++ if self.world.log.as_ref().is_none_or(|l| l.id != id) { ++ self.world.log = Some(WorldLog::new(id, self.ticks)); ++ } ++ } ++ None => { ++ if self.world.log.is_some() { ++ // Every displaced block back, then the log goes. ++ self.world.view_log(None, usize::MAX, None); ++ self.world.log = None; ++ } ++ } ++ } ++ let id = self.world.log.as_ref().map(|l| l.id); ++ let state = self ++ .world ++ .log ++ .as_ref() ++ .map(|l| (l.id, l.earliest(), self.ticks)); ++ self.mods.mods.set_world_log_state(state); ++ let target = self ++ .mods ++ .mods ++ .time_view() ++ .filter(|v| Some(v.0) == id) ++ .map(|v| v.1); ++ let active = self.world.log.as_ref().is_some_and(|l| l.active()); ++ if target.is_some() || active { ++ // The player's own neighbourhood stays as it is: nobody falls through a view. ++ let protect = self.player.as_ref().map(|p| { ++ [ ++ p.position.x.floor() as i32, ++ p.position.y.floor() as i32, ++ p.position.z.floor() as i32, ++ ] ++ }); ++ let budget = if self.film.recording() { ++ usize::MAX ++ } else { ++ 12_000 ++ }; ++ self.world.view_log(target, budget, protect); ++ } ++ } + /// `/command` typed in chat: true when a mod owns it. + pub(super) fn mod_command(&mut self, command: &str) -> bool { + if !self.mods.mods.is_running() { +diff --git a/crates/horizon-client/src/gfx.rs b/crates/horizon-client/src/gfx.rs +index 9482cf0d2..5b221fd7e 100644 +--- a/crates/horizon-client/src/gfx.rs ++++ b/crates/horizon-client/src/gfx.rs +@@ -245,6 +245,8 @@ pub struct Frame<'a> { + /// in seconds. + pub hd_smoke: &'a [HdSmoke], + pub hd_smoke_clock: f32, ++ /// One above the highest block of a world column (for HD's terrain-aware fog), if known. ++ pub hd_ground: Option<&'a (dyn Fn(i32, i32) -> i32 + 'a)>, + pub yaw: f32, + pub pitch: f32, + pub fov_degrees: f32, +@@ -5266,6 +5268,9 @@ impl Renderer { + frame.hd_lights, + frame.hd_smoke_clock, + ); ++ if let Some(top) = frame.hd_ground { ++ hd.write_ground(&self.queue, camera.x, camera.z, top); ++ } + hd.write_spots(frame.hd_spots); + hd.write(&self.queue, &hd_scene, frame.hd_lights, settings); + } +diff --git a/crates/horizon-client/src/gfx/THIRD_PARTY_PHOTON.md b/crates/horizon-client/src/gfx/THIRD_PARTY_PHOTON.md +index fd9f4d029..15838a3f7 100644 +--- a/crates/horizon-client/src/gfx/THIRD_PARTY_PHOTON.md ++++ b/crates/horizon-client/src/gfx/THIRD_PARTY_PHOTON.md +@@ -19,7 +19,7 @@ edge sharpening, Worley erosion, the single and multiple scattering phase functi + the eight-octave multiple-scattering loop, the light march with doubling steps, the transmittance remap, + the aerial perspective), `include/lighting/cloud_shadows.glsl` (the cloud shadow map, here a lookup into a + small map) and `include/fog/air_fog_vl.glsl` (the phase mix of two Henyey-Greenstein lobes, the evening +-glow). The 3D Worley and 2D noise textures are generated on our side; the ray march, the passes, the ++glow). The cirrus layer follows the structure of `include/sky/clouds/cirrus.glsl` (a thin 2D layer at height, noise-driven coverage, forward-scattering phase, no light march), written from that structure, not copied. The 3D Worley and 2D noise textures are generated on our side; the ray march, the passes, the + reprojection and the integration are our own. + + Photon is distributed under the MIT License: +diff --git a/crates/horizon-client/src/gfx/hd/cloud.wgsl b/crates/horizon-client/src/gfx/hd/cloud.wgsl +index b2bdd3080..18aac24f6 100644 +--- a/crates/horizon-client/src/gfx/hd/cloud.wgsl ++++ b/crates/horizon-client/src/gfx/hd/cloud.wgsl +@@ -75,6 +75,143 @@ fn cloud_scatter( + return s * integral; + } + ++// ---- The high cirrus layer: a thin flat sheet of wisps far above the cumulus, no light march. ---- ++ ++// Its height above the cumulus layer's base, and its extinction at full density. ++const CIRRUS_ABOVE: f32 = 707.67; ++const CIRRUS_EXT: f32 = 1.3; ++const CIRRUS_WIND: vec2 = vec2(5.5, 1.2); ++ ++// The density of the cirrus at a point of its plane (world x, z). Stretched along x (the wind), the ++// coverage from a very large field, a warp that bends the streaks, then streaks and fine wisps. ++// Every scale divides 65536 (the camera's wrap). ++fn cirrus_density(cir: vec2) -> f32 { ++ let cov = textureSampleLevel(noise2, repeat_s, vec2(cir.x / 32768.0, cir.y / 16384.0), 0.0).r; ++ let warp = (textureSampleLevel(noise2, repeat_s, vec2(cir.x / 16384.0, cir.y / 8192.0), 0.0).g - 0.5) * 1200.0; ++ let cw = vec2(cir.x, cir.y + warp); ++ let streak = textureSampleLevel(noise2, repeat_s, vec2(cw.x / 8192.0, cw.y / 1024.0), 0.0).b; ++ let wisp = textureSampleLevel(noise2, repeat_s, vec2(cw.x / 4096.0, cw.y / 512.0), 0.0).b; ++ let fine = textureSampleLevel(noise2, repeat_s, vec2(cw.x / 2048.0, cw.y / 256.0), 0.0).a; ++ let n = 0.5 * streak + 0.3 * wisp + 0.2 * fine; ++ // Rain brings more of it. ++ let t = mix(0.64, 0.50, cov) - frame.cloud_cam.z * 0.8; ++ let d = smoothstep(t, t + 0.13, n); ++ return d * sqrt(d); ++} ++ ++// The cirrus along `dir`: light and transmittance (a), lit by the same sun as the cumulus (tinted at ++// sunset), thin enough to need no march. Behind the cumulus, fading out towards the horizon. ++fn cirrus(dir: vec3) -> vec4 { ++ let rel = frame.clouds.x + CIRRUS_ABOVE; ++ if abs(dir.y) < 0.02 { return vec4(0.0, 0.0, 0.0, 1.0); } ++ let t = rel / dir.y; ++ if t <= 0.0 || t > 45000.0 { return vec4(0.0, 0.0, 0.0, 1.0); } ++ let cir = vec2(frame.cloud_cam.x + dir.x * t, frame.cloud_cam.y + dir.z * t) ++ + CIRRUS_WIND * frame.clouds.w; ++ let d = cirrus_density(cir); ++ let fade = smoothstep(0.03, 0.2, abs(dir.y)); ++ let od = d * CIRRUS_EXT * fade; ++ if od < 0.003 { return vec4(0.0, 0.0, 0.0, 1.0); } ++ let overcast = frame.sky_extra.z; ++ let light = frame.cloud_dir.xyz; ++ let cos_theta = dot(dir, light); ++ let sun_light = frame.cloud_sun.rgb * frame.cloud_sun.w * (1.0 - overcast); ++ let zenith = sky_show(textureLoad(sky_lut, vec2(0, 64), 0).rgb); ++ let horizon = sky_show(textureLoad(sky_lut, vec2(1, 64), 0).rgb); ++ let ambient = mix(horizon, zenith, 0.55) * (1.0 - 0.4 * overcast); ++ // A thin sheet scatters forward: bright near the sun, a pale veil elsewhere. ++ let direct = sun_light * (0.5 + 3.0 * hg(cos_theta, 0.7)); ++ let trans = exp(-od); ++ var colour = (1.0 - trans) * (direct + ambient * 0.9) * 1.1; ++ let haze = haze_colour(dir); ++ colour = mix((1.0 - trans) * haze, colour, exp(-t / 16000.0)); ++ return vec4(colour, trans); ++} ++ ++// Cirrus behind a cumulus result (`c`: light, transmittance). ++fn behind(c: vec4, far: vec4) -> vec4 { ++ return vec4(c.rgb + c.a * far.rgb, c.a * far.a); ++} ++ ++struct March { ++ cloud: vec4, ++ hit_t: f32, ++} ++ ++// The cumulus slab along `dir` up to `scene_len`: light and transmittance. `lite` is the cheap ++// version for the sky panorama (fewer steps, a shorter light march, no flying thing's tunnel). ++fn march_cumulus(dir: vec3, scene_len: f32, dither: f32, lite: bool) -> March { ++ var cur = vec4(0.0, 0.0, 0.0, 1.0); ++ var hit_t = 900.0; ++ let y0 = frame.clouds.x; ++ let y1 = y0 + frame.clouds.y; ++ // A level ray stays in the slab if the camera is in it (it never leaves), else misses it. ++ let dy = select(dir.y, select(-1.0e-4, 1.0e-4, dir.y >= 0.0), abs(dir.y) < 1.0e-4); ++ let ta = y0 / dy; ++ let tb = y1 / dy; ++ let lo = max(min(ta, tb), 0.0); ++ let hi = min(max(ta, tb), min(4200.0, scene_len)); ++ if hi > lo { ++ // Film quality (surface.z): half the step length, twice the cap. ++ let fine = frame.surface.z > 0.5 && !lite; ++ let n = select( ++ clamp(i32(ceil((hi - lo) / select(14.0, 7.0, fine))), select(8, 16, fine), select(26, 52, fine)), ++ 14, ++ lite, ++ ); ++ let light_steps = select(3, 2, lite); ++ let step_len = (hi - lo) / f32(n); ++ let light = frame.cloud_dir.xyz; ++ let cos_theta = dot(dir, light); ++ let overcast = frame.sky_extra.z; ++ let ext = CLOUD_EXT * (1.0 - 0.25 * overcast); ++ let sca = ext; ++ let bounced = 0.4 * max(light.y, 0.0) / CPI; ++ var scatter = vec2(0.0); ++ var t_acc = 1.0; ++ var dist_sum = 0.0; ++ var weight_sum = 0.0; ++ for (var i = 0; i < n; i++) { ++ if t_acc < 0.075 { break; } ++ let t = lo + step_len * (f32(i) + dither); ++ let pos = dir * t; ++ var d = cloud_density(pos, 1.0); ++ if d < 0.002 { continue; } ++ d *= 1.0 - smoothstep(0.8, 1.0, t / 4200.0); ++ // A flying thing's tunnel through the cloud. ++ if !lite && frame.smoke.x > 0.5 { d *= 1.0 - smoke_at(smoke_tex, linear, pos).a; } ++ let step_od = d * ext * step_len; ++ let step_t = exp(-step_od); ++ let h = clamp((pos.y - y0) / frame.clouds.y, 0.0, 1.0); ++ let hash = fract(dither * 7.13 + f32(i) * 0.618); ++ let light_od = cloud_light_depth(pos, light, light_steps, hash, 1.0); ++ let sky_od = cloud_light_depth(pos, vec3(0.0, 1.0, 0.0), 1, 1.0 - hash, 0.0); ++ // A guess of the optical depth to the ground from the altitude and this density. ++ let ground_od = mix(d, 1.0, clamp(h * 2.0 - 1.0, 0.0, 1.0)) * h * frame.clouds.y; ++ scatter += cloud_scatter(d, light_od, sky_od, ground_od, ext, sca, step_t, cos_theta, bounced) * t_acc; ++ t_acc *= step_t; ++ dist_sum += t * d; ++ weight_sum += d; ++ } ++ if weight_sum > 0.0 { hit_t = dist_sum / weight_sum; } ++ // The sunlight's colour at this hour (Photon: the light's colour from the transmittance), ++ // the sky's own light from the zenith and the horizon; rain darkens the sky's share too. ++ let sun_light = frame.cloud_sun.rgb * frame.cloud_sun.w * (1.0 - overcast); ++ let zenith = sky_show(textureLoad(sky_lut, vec2(0, 64), 0).rgb); ++ let horizon = sky_show(textureLoad(sky_lut, vec2(1, 64), 0).rgb); ++ let ambient = mix(horizon, zenith, 0.55) * (1.0 - 0.4 * overcast); ++ var colour = scatter.x * sun_light * 3.2 + scatter.y * ambient * 5.0; ++ // The remap of Photon: the transmittance's floor is 0. ++ let trans = linear_step(0.075, 1.0, t_acc); ++ // Aerial perspective: far clouds fade into the haze. ++ let haze = haze_colour(dir); ++ let air = exp(-hit_t / 3600.0); ++ colour = mix((1.0 - trans) * haze, colour, air); ++ cur = vec4(colour, trans); ++ } ++ return March(cur, hit_t); ++} ++ + @fragment + fn fs_cloud(in: FullOut) -> CloudOut { + // The nearest of the four world pixels this texel stands for: the march ends at the surface +@@ -99,72 +236,11 @@ fn fs_cloud(in: FullOut) -> CloudOut { + let ndc = vec4(in.uv.x * 2.0 - 1.0, 1.0 - in.uv.y * 2.0, 0.5, 1.0); + let hh = frame.inverse_view_proj * ndc; + let dir = normalize(hh.xyz / hh.w); +- var cur = vec4(0.0, 0.0, 0.0, 1.0); +- var hit_t = 900.0; +- let y0 = frame.clouds.x; +- let y1 = y0 + frame.clouds.y; +- // A level ray stays in the slab if the camera is in it (it never leaves), else misses it. +- let dy = select(dir.y, select(-1.0e-4, 1.0e-4, dir.y >= 0.0), abs(dir.y) < 1.0e-4); +- { +- let ta = y0 / dy; +- let tb = y1 / dy; +- let lo = max(min(ta, tb), 0.0); +- let hi = min(max(ta, tb), min(4200.0, scene_len)); +- if hi > lo { +- let dither = ign(in.position.xy); +- // Film quality (surface.z): half the step length, twice the cap. +- let fine = frame.surface.z > 0.5; +- let n = clamp(i32(ceil((hi - lo) / select(14.0, 7.0, fine))), select(8, 16, fine), select(26, 52, fine)); +- let step_len = (hi - lo) / f32(n); +- let light = frame.cloud_dir.xyz; +- let cos_theta = dot(dir, light); +- let overcast = frame.sky_extra.z; +- let ext = CLOUD_EXT * (1.0 - 0.25 * overcast); +- let sca = ext; +- let bounced = 0.4 * max(light.y, 0.0) / CPI; +- var scatter = vec2(0.0); +- var t_acc = 1.0; +- var dist_sum = 0.0; +- var weight_sum = 0.0; +- for (var i = 0; i < n; i++) { +- if t_acc < 0.075 { break; } +- let t = lo + step_len * (f32(i) + dither); +- let pos = dir * t; +- var d = cloud_density(pos, 1.0); +- if d < 0.002 { continue; } +- d *= 1.0 - smoothstep(0.8, 1.0, t / 4200.0); +- // A flying thing's tunnel through the cloud. +- if frame.smoke.x > 0.5 { d *= 1.0 - smoke_at(smoke_tex, linear, pos).a; } +- let step_od = d * ext * step_len; +- let step_t = exp(-step_od); +- let h = clamp((pos.y - y0) / frame.clouds.y, 0.0, 1.0); +- let hash = fract(dither * 7.13 + f32(i) * 0.618); +- let light_od = cloud_light_depth(pos, light, 3, hash, 1.0); +- let sky_od = cloud_light_depth(pos, vec3(0.0, 1.0, 0.0), 1, 1.0 - hash, 0.0); +- // A guess of the optical depth to the ground from the altitude and this density. +- let ground_od = mix(d, 1.0, clamp(h * 2.0 - 1.0, 0.0, 1.0)) * h * frame.clouds.y; +- scatter += cloud_scatter(d, light_od, sky_od, ground_od, ext, sca, step_t, cos_theta, bounced) * t_acc; +- t_acc *= step_t; +- dist_sum += t * d; +- weight_sum += d; +- } +- if weight_sum > 0.0 { hit_t = dist_sum / weight_sum; } +- // The sunlight's colour at this hour (Photon: the light's colour from the transmittance), +- // the sky's own light from the zenith and the horizon. +- let sun_light = frame.cloud_sun.rgb * frame.cloud_sun.w * (1.0 - overcast); +- let zenith = sky_show(textureLoad(sky_lut, vec2(0, 64), 0).rgb); +- let horizon = sky_show(textureLoad(sky_lut, vec2(1, 64), 0).rgb); +- let ambient = mix(horizon, zenith, 0.55); +- var colour = scatter.x * sun_light * 3.2 + scatter.y * ambient * 5.0; +- // The remap of Photon: the transmittance's floor is 0. +- let trans = linear_step(0.075, 1.0, t_acc); +- // Aerial perspective: far clouds fade into the haze. +- let haze = haze_colour(dir); +- let air = exp(-hit_t / 3600.0); +- colour = mix((1.0 - trans) * haze, colour, air); +- cur = vec4(colour, trans); +- } +- } ++ let m = march_cumulus(dir, scene_len, ign(in.position.xy), false); ++ var cur = m.cloud; ++ let hit_t = m.hit_t; ++ // The cirrus stands behind everything but the sky. ++ if scene_len >= SKY_LEN * 0.99 { cur = behind(cur, cirrus(dir)); } + var out: CloudOut; + out.dist = vec4(scene_len, 0.0, 0.0, 0.0); + // Reproject the history by where the clouds are (rotation and the camera's step) and blend. +@@ -179,9 +255,11 @@ fn fs_cloud(in: FullOut) -> CloudOut { + let hs = vec2(textureDimensions(history_dist)); + let old_len = textureLoad(history_dist, vec2(huv * hs), 0).x; + let same_len = 1.0 - smoothstep(0.5, 1.0, abs(old_len - scene_len) / (0.1 * min(scene_len, old_len) + 2.0)); +- // Not too much of a history that disagrees by a lot (a gust, a fast turn). ++ // The march's own noise (a dithered, short march) also makes the two differ: only ++ // a clear disagreement (a gust, a fast change) drops the history, so a fast turn ++ // keeps its smoothness instead of showing the noise of fresh samples. + let diff = length(old.rgb - cur.rgb) + abs(old.a - cur.a); +- let keep = 0.9 * (1.0 - smoothstep(0.35, 1.2, diff)) * same_len; ++ let keep = 0.92 * (1.0 - smoothstep(0.7, 1.9, diff)) * same_len; + cur = mix(cur, old, keep); + } + } +@@ -189,3 +267,22 @@ fn fs_cloud(in: FullOut) -> CloudOut { + out.cloud = cur; + return out; + } ++ ++// The sky panorama: the clouds as seen from the camera in every direction above the horizon ++// (azimuth u over the whole circle from +x, elevation v = sqrt(e / (pi / 2))), without the scene. ++// Lite march, blended with last frame's panorama (the history is in world directions, no ++// reprojection). The water's and the wet surfaces' sky reflections read it. ++@fragment ++fn fs_cloud_sky(in: FullOut) -> @location(0) vec4 { ++ let e = CPI * 0.5 * in.uv.y * in.uv.y; ++ let phi = (in.uv.x - 0.5) * 2.0 * CPI; ++ let dir = vec3(cos(e) * cos(phi), sin(e), cos(e) * sin(phi)); ++ let m = march_cumulus(dir, SKY_LEN, ign(in.position.xy), true); ++ var cur = behind(m.cloud, cirrus(dir)); ++ if frame.cloud_cam.w > 0.5 { ++ let old = textureLoad(history, vec2(in.position.xy), 0); ++ let diff = length(old.rgb - cur.rgb) + abs(old.a - cur.a); ++ cur = mix(cur, old, 0.8 * (1.0 - smoothstep(0.6, 1.8, diff))); ++ } ++ return cur; ++} +diff --git a/crates/horizon-client/src/gfx/hd/cloud_shadow.wgsl b/crates/horizon-client/src/gfx/hd/cloud_shadow.wgsl +index 8fca87fba..36cfe66ef 100644 +--- a/crates/horizon-client/src/gfx/hd/cloud_shadow.wgsl ++++ b/crates/horizon-client/src/gfx/hd/cloud_shadow.wgsl +@@ -1,18 +1,19 @@ +- + @fragment + fn fs_cloud_shadow(in: FullOut) -> @location(0) vec4 { +- // A square of the cloud base plane round the camera; a texel holds the optical depth of the +- // sunlight's way through the slab from that point. +- let q = (in.uv - vec2(0.5)) * (2.0 * SHADOW_R); ++ // A square of the cloud base plane, centred where the sunlight through the camera crosses it ++ // (so a low sun, whose shadows fall far from the cloud, still covers the ground round the ++ // camera); a texel holds the optical depth of the sunlight's way through the slab from there. + let light = frame.cloud_dir.xyz; +- let ly = max(light.y, 0.15); ++ let ly = max(light.y, 0.04); ++ let centre = light.xz * (frame.clouds.x / ly); ++ let q = centre + (in.uv - vec2(0.5)) * (2.0 * SHADOW_R); + let base = vec3(q.x, frame.clouds.x + 0.5, q.y); + let len = frame.clouds.y / ly; + var od = 0.0; +- for (var i = 0; i < 4; i++) { +- let t = (f32(i) + 0.5) / 4.0 * len; ++ for (var i = 0; i < 8; i++) { ++ let t = (f32(i) + 0.5) / 8.0 * len; + od += cloud_density(base + light * t, 0.0); + } +- od *= CLOUD_EXT * len / 4.0 * (1.0 - 0.25 * frame.sky_extra.z); ++ od *= CLOUD_EXT * len / 8.0 * (1.0 - 0.25 * frame.sky_extra.z); + return vec4(od, 0.0, 0.0, 1.0); + } +diff --git a/crates/horizon-client/src/gfx/hd/fog.wgsl b/crates/horizon-client/src/gfx/hd/fog.wgsl +index 3fde6e22f..40a81e540 100644 +--- a/crates/horizon-client/src/gfx/hd/fog.wgsl ++++ b/crates/horizon-client/src/gfx/hd/fog.wgsl +@@ -8,6 +8,11 @@ + @group(0) @binding(6) var linear: sampler; + //SKY7 + @group(0) @binding(8) var smoke_tex: texture_2d; ++// The ground's height (r) and basin depth (g) round the camera, 8-block cells, stored toroidally ++// (64 cells = 512 blocks): read with the world x, z over 512 and a repeating sampler. ++@group(0) @binding(9) var ground_tex: texture_2d; ++// The far smoke grid (12-block cells). ++@group(0) @binding(10) var smoke_far_tex: texture_2d; + + //SPOT + +@@ -49,24 +54,42 @@ fn sun_visible(p: vec3) -> f32 { + } + + // The air's extinction per block at a camera-relative point: a haze that thins with height above +-// the sea, a morning mist hugging the ground, rain, patches from a 3D noise that drifts (its scale divides 65536, the wrap of the camera's x, z, so it does not jump at x or z = 0); none +-// deep underground. ++// the sea and pools a little in valleys, a morning mist that follows the ground (it fills a valley ++// up to about its rim, and clings thin to flat ground and ridges), rain, patches from a 3D noise ++// that drifts (its scale divides 65536, the wrap of the camera's x, z, so it does not jump at ++// x or z = 0); none deep under the ground. + fn fog_sigma(p: vec3) -> f32 { + let wy = p.y + frame.vfog.y; ++ let wxz = vec2(p.x + frame.cloud_cam.x, p.z + frame.cloud_cam.y); ++ let gr = textureSampleLevel(ground_tex, repeat_s, wxz / 512.0, 0.0).rg; ++ let ground = gr.x; ++ let valley = smoothstep(3.0, 24.0, gr.y); ++ let above = max(wy - ground, 0.0); + let h = wy - 62.0; + var s = 0.0016 * exp(clamp(-h / 42.0, -6.0, 1.3)); +- s += frame.vfog.z * 0.011 * exp(clamp(-h / 15.0, -6.0, 1.0)); ++ // Valleys hold some haze through the day too. ++ s += 0.0012 * valley * exp(clamp(-above / (10.0 + 0.6 * gr.y), -6.0, 0.0)); ++ // Mist: in a valley it fills up to the rim (three quarters of the way to the average ground) ++ // and fades over a few blocks above; elsewhere it hugs the ground. ++ let rim = ground + 0.75 * gr.y; ++ let fill = exp(clamp(-max(wy - rim, 0.0) / 9.0, -6.0, 0.0)); ++ let hug = exp(clamp(-above / 11.0, -6.0, 0.0)); ++ s += frame.vfog.z * 0.011 * mix(0.55 * hug, 1.35 * fill, valley); + s += frame.sky_extra.z * 0.003; +- let w = vec3(p.x + frame.cloud_cam.x, wy, p.z + frame.cloud_cam.y) +- + vec3(0.5, 0.0, 0.35) * frame.clouds.w; ++ let w = vec3(wxz.x, wy, wxz.y) + vec3(0.5, 0.0, 0.35) * frame.clouds.w; + let n = textureSampleLevel(noise3, repeat_s, w / 128.0, 0.0).b; + let patchy = 0.35 + 1.3 * smoothstep(0.25, 0.75, n); +- // Fade out far below the sea's height: caves keep their own dark air. +- return s * patchy * smoothstep(28.0, 58.0, wy); ++ // Fade out below the ground (caves keep their own dark air); unknown ground reads as the sea. ++ // A low sun shows its shafts better in a little denser air (Photon thickens the fog at dawn and dusk too). ++ let low_sun = (1.0 - smoothstep(0.05, 0.5, frame.sky_sun.y)) * min(frame.sun.w * 3.0, 1.0); ++ return s * patchy * (1.0 + 0.9 * low_sun) * smoothstep(ground - 14.0, ground - 3.0, wy); + } + + const SMOKE_MAX: f32 = 200.0; + const SMOKE_STEP: f32 = 3.5; ++// The far grid's range and its step. ++const SMOKE_FAR_MAX: f32 = 800.0; ++const SMOKE_FAR_STEP: f32 = 12.0; + const SMOKE_WIND: vec2 = vec2(1.6, 1.2); + + fn fire_colour(h: f32) -> vec3 { +@@ -86,17 +109,29 @@ fn smoke_detail(pos: vec3, core: f32) -> f32 { + return core * mix(0.35, 1.45, keep) * mix(0.6, 1.0, smoothstep(0.0, 0.6, core)); + } + +-// The smoke between the camera and `len` along `dir`: light and transmittance (a). +-fn march_smoke(dir: vec3, len: f32, jitter: f32, haze: vec3, cos_v: f32) -> vec4 { +- let lo = frame.smoke_min.xyz; +- let hi = lo + vec3(128.0, 64.0, 128.0) * frame.smoke.y; ++// One cascade of the smoke grid at a point: the near one raw (the cover below weighs it), the far ++// one with its edge fade. ++fn smoke_cell(far: bool, p: vec3) -> vec4 { ++ if far { return smoke_far_at(smoke_far_tex, linear, p); } ++ return smoke_raw(smoke_tex, linear, p, frame.smoke_min.xyz, frame.smoke.y); ++} ++ ++// The smoke of one cascade between the camera and `len` along `dir`: light and transmittance (a). ++// The near cascade weighs a point by `smoke_near_cover`, the far one by what is left, so the seam ++// carries the same smoke either way. ++fn march_smoke(dir: vec3, len: f32, jitter: f32, haze: vec3, cos_v: f32, far: bool) -> vec4 { ++ let cell = select(frame.smoke.y, frame.smoke_far.w, far); ++ let lo = select(frame.smoke_min.xyz, frame.smoke_far.xyz, far); ++ let hi = lo + vec3(128.0, 64.0, 128.0) * cell; ++ let near_on = frame.smoke.x > 0.5; + let inv = vec3(1.0) / select(dir, vec3(1e-5), abs(dir) < vec3(1e-5)); + let t0v = (lo - vec3(0.0)) * inv; + let t1v = (hi - vec3(0.0)) * inv; + let t_in = max(max(min(t0v.x, t1v.x), min(t0v.y, t1v.y)), max(min(t0v.z, t1v.z), 0.0)); + let t_out = min(min(max(t0v.x, t1v.x), max(t0v.y, t1v.y)), min(max(t0v.z, t1v.z), len)); + if t_out <= t_in { return vec4(0.0, 0.0, 0.0, 1.0); } +- let n = clamp(i32(ceil((t_out - t_in) / SMOKE_STEP)), 1, 64); ++ let step_len = select(SMOKE_STEP, SMOKE_FAR_STEP, far); ++ let n = clamp(i32(ceil((t_out - t_in) / step_len)), 1, select(64, 72, far)); + let ds = (t_out - t_in) / f32(n); + let sun = frame.sun.xyz; + let sun_on = frame.sun.w; +@@ -108,9 +143,13 @@ fn march_smoke(dir: vec3, len: f32, jitter: f32, haze: vec3, cos_v: f3 + for (var i = 0; i < n; i++) { + if trans < 0.02 { break; } + let pos = dir * (t_in + (f32(i) + jitter) * ds); +- if smoke_probe(smoke_tex, linear, pos) < 0.003 { continue; } +- let g = smoke_at(smoke_tex, linear, pos); ++ let cover = select(0.0, smoke_near_cover(pos), near_on); ++ let weight = select(cover, 1.0 - cover, far); ++ if weight < 0.003 { continue; } ++ var g = smoke_cell(far, pos); + if g.x < 0.004 { continue; } ++ g *= weight; ++ if g.x < 0.002 { continue; } + let dens = smoke_detail(pos, g.x); + let a = 1.0 - exp(-dens * ds); + let inv_d = 1.0 / max(g.x, 1e-4); +@@ -121,8 +160,9 @@ fn march_smoke(dir: vec3, len: f32, jitter: f32, haze: vec3, cos_v: f3 + var vis = 1.0; + if sun_on > 0.0 { vis = sun_visible(pos); } + var od = 0.0; ++ let lstep = select(4.0, 16.0, far); + for (var k = 0; k < 3; k++) { +- od += smoke_at(smoke_tex, linear, pos + sun * (f32(k) + 0.5 + 0.5 * jitter) * 4.0).x * 4.0; ++ od += smoke_cell(far, pos + sun * (f32(k) + 0.5 + 0.5 * jitter) * lstep).x * lstep; + } + let through = 0.65 * exp(-od * 0.9) + 0.35 * exp(-od * 0.22); + var glow = vec3(0.0); +@@ -136,7 +176,7 @@ fn march_smoke(dir: vec3, len: f32, jitter: f32, haze: vec3, cos_v: f3 + glow += frame.smoke_lights[j * 2 + 1].rgb / (dist * dist + 6.0) * window; + } + let ambient = up_sky * (0.25 + 0.75 * exp(-od * 0.35)) * FOG_AMBIENT; +- var s = albedo * (sun_light * vis * phase * through * FOG_SUN + ambient + glow * 1.5); ++ var s = albedo * (sun_light * vis * phase * through * 1.1 + ambient + glow * 1.5); + s += fire_colour(heat) * heat * heat * 9.0; + light += trans * a * s; + trans *= 1.0 - a; +@@ -209,8 +249,16 @@ fn fs_fog(in: FullOut) -> FogOut { + if frame.vfog.w > 0.5 { + fog = vec4(fog.rgb + spot_beams(dir, select(BEAM_FAR, length(p), d > 0.0), jitter), fog.a); + } +- if frame.smoke.x > 0.5 { +- let sm = march_smoke(dir, select(SMOKE_MAX, min(length(p), SMOKE_MAX), d > 0.0), jitter, haze, cos_v); ++ if frame.smoke.x > 0.5 || frame.smoke.w > 0.5 { ++ let surface = d > 0.0; ++ var sm = vec4(0.0, 0.0, 0.0, 1.0); ++ if frame.smoke.x > 0.5 { ++ sm = march_smoke(dir, select(SMOKE_MAX, min(length(p), SMOKE_MAX), surface), jitter, haze, cos_v, false); ++ } ++ if frame.smoke.w > 0.5 { ++ let far = march_smoke(dir, select(SMOKE_FAR_MAX, min(length(p), SMOKE_FAR_MAX), surface), jitter, haze, cos_v, true); ++ sm = vec4(sm.rgb + sm.a * far.rgb, sm.a * far.a); ++ } + // The smoke is lit by the sun itself and stands in the haze: it is laid over the fog. + fog = vec4(fog.rgb + fog.a * sm.rgb, fog.a * sm.a); + } +@@ -218,7 +266,7 @@ fn fs_fog(in: FullOut) -> FogOut { + return out; + } + +-const FOG_SUN: f32 = 1.1; ++const FOG_SUN: f32 = 1.35; + const FOG_AMBIENT: f32 = 0.9; + fn linear_step(a: f32, b: f32, x: f32) -> f32 { + return clamp((x - a) / (b - a), 0.0, 1.0); +diff --git a/crates/horizon-client/src/gfx/hd/frame.rs b/crates/horizon-client/src/gfx/hd/frame.rs +index 6b06732c3..a98bbd2b9 100644 +--- a/crates/horizon-client/src/gfx/hd/frame.rs ++++ b/crates/horizon-client/src/gfx/hd/frame.rs +@@ -114,10 +114,12 @@ pub(super) struct HdFrame { + /// the specular and the wet look are on. + pub(super) surface: [f32; 4], + /// Smoke (see `smoke.rs`). x: 1 when the smoke grid is drawn; y: the grid's cell size in blocks; +- /// z: the smoke clock in seconds modulo 86400 (the noise rides the wind with it); w: unused. ++ /// z: the smoke clock in seconds modulo 86400 (the noise rides the wind with it); w: 1 when the far grid has smoke (x: the near one has). + pub(super) smoke: [f32; 4], + /// xyz: the grid's minimum corner relative to the camera; w: the number of glow lights. + pub(super) smoke_min: [f32; 4], ++ /// xyz: the far smoke grid's minimum corner relative to the camera; w: its cell size. ++ pub(super) smoke_far: [f32; 4], + /// Up to 16 lights that glow on the smoke: xyz position relative to the camera, w radius; then + /// rgb colour times intensity. + pub(super) smoke_lights: [[f32; 4]; 32], +diff --git a/crates/horizon-client/src/gfx/hd/ground.rs b/crates/horizon-client/src/gfx/hd/ground.rs +new file mode 100644 +index 000000000..29fbf9c6e +--- /dev/null ++++ b/crates/horizon-client/src/gfx/hd/ground.rs +@@ -0,0 +1,208 @@ ++//! AirDef fork: a coarse map of the ground's height round the camera, for the volumetric fog. ++//! ++//! The fog's mist pools in valleys and thins on ridges: it needs to know where the ground is, not ++//! only a sea level. The map is 64 x 64 cells of 8 blocks (512 blocks across, the fog reaches 192), ++//! stored *toroidally* (a world cell lives at index `cell mod 64`, so a repeating sampler reads it ++//! with the world coordinate and nothing is copied when the camera moves). The CPU refreshes a few ++//! hundred cells a frame from the client's own height data (`Frame::hd_ground`), round-robin, so ++//! the cost is bounded; a long jump of the camera refreshes everything at once. ++//! ++//! Contract: ++//! - Writes `view` (`Rg16Float`, 64 x 64): r the ground's height (one above the top block, the ++//! lowest of four samples per cell so trees do not make hills), g the *basin depth*: how far the ++//! cell lies below the average ground within about 48 blocks (0 on flat ground and ridges, up to ++//! 48 in a valley), clamped to 0..48. ++//! - Read by `fs_fog` through a repeating, linear sampler at `world xz / 512` (the camera's x, z ++//! come modulo 65536, which 512 divides). ++//! - Unloaded columns count as sea level (62), the old behaviour of the fog. ++ ++pub const CELLS: usize = 64; ++/// Blocks per cell. ++pub const CELL: i32 = 8; ++pub const FORMAT: wgpu::TextureFormat = wgpu::TextureFormat::Rg16Float; ++/// Cells refreshed per frame. ++const BUDGET: usize = 256; ++/// The box blur's radius in cells (48 blocks), and the deepest basin kept. ++const BLUR: i32 = 6; ++const DEEPEST: f32 = 48.0; ++const SEA: f32 = 62.0; ++/// `MIN_Y` of the world: what the height query returns for an unloaded column. ++const UNLOADED: i32 = -64; ++ ++pub struct Ground { ++ tex: wgpu::Texture, ++ pub view: wgpu::TextureView, ++ height: Vec, ++ basin: Vec, ++ cursor: usize, ++ centre: Option<[i32; 2]>, ++ changed: bool, ++ since_blur: u32, ++ scratch: Vec, ++} ++ ++impl Ground { ++ pub fn new(device: &wgpu::Device, queue: &wgpu::Queue) -> Self { ++ let tex = device.create_texture(&wgpu::TextureDescriptor { ++ label: Some("HD ground"), ++ size: wgpu::Extent3d { ++ width: CELLS as u32, ++ height: CELLS as u32, ++ depth_or_array_layers: 1, ++ }, ++ mip_level_count: 1, ++ sample_count: 1, ++ dimension: wgpu::TextureDimension::D2, ++ format: FORMAT, ++ usage: wgpu::TextureUsages::TEXTURE_BINDING | wgpu::TextureUsages::COPY_DST, ++ view_formats: &[], ++ }); ++ let view = tex.create_view(&Default::default()); ++ let mut ground = Self { ++ tex, ++ view, ++ height: vec![SEA; CELLS * CELLS], ++ basin: vec![0.0; CELLS * CELLS], ++ cursor: 0, ++ centre: None, ++ changed: false, ++ since_blur: 0, ++ scratch: vec![0; CELLS * CELLS * 2], ++ }; ++ ground.upload(queue); ++ ground ++ } ++ ++ /// Refreshes the next cells for a camera at world (`x`, `z`); `top` gives one above the highest ++ /// non-air block of a column. ++ pub fn update(&mut self, queue: &wgpu::Queue, x: f64, z: f64, top: &dyn Fn(i32, i32) -> i32) { ++ let cell = [ ++ (x.floor() as i32).div_euclid(CELL), ++ (z.floor() as i32).div_euclid(CELL), ++ ]; ++ let jump = self ++ .centre ++ .is_none_or(|c| (c[0] - cell[0]).abs() > 24 || (c[1] - cell[1]).abs() > 24); ++ self.centre = Some(cell); ++ // A jump (a teleport, the first frame) refreshes the whole map now. ++ let count = if jump { CELLS * CELLS } else { BUDGET }; ++ let half = CELLS as i32 / 2; ++ for _ in 0..count { ++ let k = self.cursor; ++ self.cursor = (self.cursor + 1) % (CELLS * CELLS); ++ let (i, j) = ((k % CELLS) as i32, (k / CELLS) as i32); ++ // The world cell of this index that lies in the window round the camera. ++ let wx = cell[0] - half + (i - (cell[0] - half)).rem_euclid(CELLS as i32); ++ let wz = cell[1] - half + (j - (cell[1] - half)).rem_euclid(CELLS as i32); ++ let (bx, bz) = (wx * CELL, wz * CELL); ++ let mut low = i32::MAX; ++ for (dx, dz) in [(1, 1), (5, 2), (2, 5), (6, 6)] { ++ let h = top(bx + dx, bz + dz); ++ if h > UNLOADED { ++ low = low.min(h); ++ } ++ } ++ let h = if low == i32::MAX { SEA } else { low as f32 }; ++ if (self.height[k] - h).abs() > 0.01 { ++ self.height[k] = h; ++ self.changed = true; ++ } ++ } ++ self.since_blur += 1; ++ if self.changed && (jump || self.since_blur >= 4) { ++ self.blur(); ++ self.upload(queue); ++ self.changed = false; ++ self.since_blur = 0; ++ } ++ } ++ ++ /// The basin depth: the mean height within `BLUR` cells (a wrapping box blur, two passes) less the ++ /// cell's own. ++ fn blur(&mut self) { ++ let n = CELLS as i32; ++ let mut tmp = vec![0.0f32; CELLS * CELLS]; ++ let mut out = vec![0.0f32; CELLS * CELLS]; ++ let norm = 1.0 / (2 * BLUR + 1) as f32; ++ for j in 0..n { ++ for i in 0..n { ++ let mut s = 0.0; ++ for d in -BLUR..=BLUR { ++ s += self.height[(j * n + (i + d).rem_euclid(n)) as usize]; ++ } ++ tmp[(j * n + i) as usize] = s * norm; ++ } ++ } ++ for j in 0..n { ++ for i in 0..n { ++ let mut s = 0.0; ++ for d in -BLUR..=BLUR { ++ s += tmp[((j + d).rem_euclid(n) * n + i) as usize]; ++ } ++ out[(j * n + i) as usize] = s * norm; ++ } ++ } ++ for k in 0..CELLS * CELLS { ++ self.basin[k] = (out[k] - self.height[k]).clamp(0.0, DEEPEST); ++ } ++ } ++ ++ fn upload(&mut self, queue: &wgpu::Queue) { ++ for k in 0..CELLS * CELLS { ++ self.scratch[k * 2] = to_half(self.height[k]); ++ self.scratch[k * 2 + 1] = to_half(self.basin[k]); ++ } ++ queue.write_texture( ++ self.tex.as_image_copy(), ++ bytemuck::cast_slice(&self.scratch), ++ wgpu::TexelCopyBufferLayout { ++ offset: 0, ++ bytes_per_row: Some(CELLS as u32 * 4), ++ rows_per_image: Some(CELLS as u32), ++ }, ++ wgpu::Extent3d { ++ width: CELLS as u32, ++ height: CELLS as u32, ++ depth_or_array_layers: 1, ++ }, ++ ); ++ } ++} ++ ++/// An `f32` as IEEE half bits (normal range, rounded down; heights and depths stay below 512). ++fn to_half(v: f32) -> u16 { ++ let v = v.clamp(0.0, 2048.0); ++ if v < 6.2e-5 { ++ return 0; ++ } ++ let bits = v.to_bits(); ++ let exp = ((bits >> 23) as i32 - 127 + 15).clamp(1, 30) as u16; ++ let mant = ((bits >> 13) & 0x3ff) as u16; ++ (exp << 10) | mant ++} ++ ++#[cfg(test)] ++mod tests { ++ use super::*; ++ ++ #[test] ++ fn half_floats_round_trip_closely() { ++ let from_half = |h: u16| { ++ let e = ((h >> 10) & 31) as i32; ++ if e == 0 { ++ 0.0 ++ } else { ++ (1.0 + (h & 0x3ff) as f32 / 1024.0) * 2f32.powi(e - 15) ++ } ++ }; ++ for v in [0.0f32, 1.0, 12.5, 62.0, 143.7, 320.25, 1000.0] { ++ let r = from_half(to_half(v)); ++ assert!((r - v).abs() <= v * 0.001 + 0.001, "{v} -> {r}"); ++ } ++ } ++ ++ #[test] ++ fn the_map_side_divides_the_camera_wrap() { ++ assert_eq!(65536 % (CELLS as u64 * CELL as u64), 0); ++ } ++} +diff --git a/crates/horizon-client/src/gfx/hd/light.wgsl b/crates/horizon-client/src/gfx/hd/light.wgsl +index a9e1fb7f4..bbeb35b86 100644 +--- a/crates/horizon-client/src/gfx/hd/light.wgsl ++++ b/crates/horizon-client/src/gfx/hd/light.wgsl +@@ -32,6 +32,7 @@ struct Light { + @group(0) @binding(19) var cloud_shadow_tex: texture_2d; + // How far each cloud texel's ray was marched (the surface behind it, or SKY_RAY for sky). + @group(0) @binding(20) var cloud_dist_tex: texture_2d; ++//PANO21 + const SKY_RAY: f32 = 20000.0; + const CLOUD_SHADOW_R: f32 = 1200.0; + // The pixel being lit, for the shadow filter's noise. +@@ -158,16 +159,20 @@ fn linear_fog(d: f32, start: f32, end: f32) -> f32 { + fn cloud_shadow(p: vec3) -> f32 { + if frame.clouds.z < 0.5 { return 1.0; } + let l = frame.cloud_dir.xyz; +- if l.y < 0.1 { return 1.0; } +- let t = (frame.clouds.x - p.y) / l.y; ++ // Fades in smoothly with the sun's height (no pop at the low sun's end). ++ let sun_fade = smoothstep(0.03, 0.2, l.y); ++ if sun_fade <= 0.0 { return 1.0; } ++ let t = (frame.clouds.x - p.y) / max(l.y, 0.04); + if t <= 0.0 { return 1.0; } +- let q = p.xz + l.xz * t; +- let uv = q / (2.0 * CLOUD_SHADOW_R) + vec2(0.5); +- if any(uv < vec2(0.0)) || any(uv > vec2(1.0)) { return 1.0; } +- let od = textureSampleLevel(cloud_shadow_tex, linear, uv, 0.0).r; +- // Fade out as the sun gets low (the shadow then falls far from the cloud). +- let fade = smoothstep(0.1, 0.25, l.y); +- return mix(1.0, mix(1.0, exp(-od * 0.9), 0.9), fade); ++ // The map is centred where the sunlight through the camera crosses the cloud base (as the pass). ++ let centre = l.xz * (frame.clouds.x / max(l.y, 0.04)); ++ let uv = (p.xz + l.xz * t - centre) / (2.0 * CLOUD_SHADOW_R) + vec2(0.5); ++ // Fades out over the map's last tenth instead of stopping at its edge. ++ let edge = min(min(uv.x, 1.0 - uv.x), min(uv.y, 1.0 - uv.y)); ++ let edge_fade = smoothstep(0.0, 0.1, edge); ++ if edge_fade <= 0.0 { return 1.0; } ++ let od = textureSampleLevel(cloud_shadow_tex, linear, clamp(uv, vec2(0.0), vec2(1.0)), 0.0).r; ++ return mix(1.0, mix(1.0, exp(-od * 0.9), 0.9), sun_fade * edge_fade); + } + + // The volumetric fog at a full-resolution pixel `dist` away: the four nearest half-resolution +@@ -357,7 +362,8 @@ fn shade_surface(px: vec2, p: vec3, water: bool) -> vec3 { + } + if atmosphere && gloss > 0.12 { + let r = reflect(-v, n); +- let sky = atmosphere_sky(normalize(vec3(r.x, max(r.y, 0.02), r.z))); ++ let rd = normalize(vec3(r.x, max(r.y, 0.02), r.z)); ++ let sky = sky_with_clouds(atmosphere_sky(rd), rd); + let reach = smoothstep(0.35, 0.95, lm.x) * smoothstep(-0.2, 0.15, r.y); + out += sky * fresnel * (gloss * gloss * reach * ao_ambient); + } +diff --git a/crates/horizon-client/src/gfx/hd/lighting.rs b/crates/horizon-client/src/gfx/hd/lighting.rs +index 8c56768f8..23e16abfd 100644 +--- a/crates/horizon-client/src/gfx/hd/lighting.rs ++++ b/crates/horizon-client/src/gfx/hd/lighting.rs +@@ -34,7 +34,7 @@ pub const MAX_LIGHTS: usize = 512; + + pub(super) const LIGHT: &str = include_str!("light.wgsl"); + /// The lighting's group 0, binding by binding (see the contract above). +-pub(super) const LIGHT_BINDINGS: [wgpu::BindingType; 21] = [ ++pub(super) const LIGHT_BINDINGS: [wgpu::BindingType; 22] = [ + UNIFORM, + UNFILTERED, + DEPTH, +@@ -56,6 +56,7 @@ pub(super) const LIGHT_BINDINGS: [wgpu::BindingType; 21] = [ + FLOAT, + FLOAT, + UNFILTERED, ++ FLOAT, + ]; + + /// The outside views and sampler the lighting group reads. +@@ -223,6 +224,7 @@ impl Hd { + wgpu::BindingResource::TextureView(self.volumes.cloud_view()), + wgpu::BindingResource::TextureView(&self.volumes.cloud_shadow), + wgpu::BindingResource::TextureView(self.volumes.cloud_dist_view()), ++ wgpu::BindingResource::TextureView(self.volumes.pano_view()), + ]; + let entries: Vec<_> = resources + .into_iter() +diff --git a/crates/horizon-client/src/gfx/hd/materials.rs b/crates/horizon-client/src/gfx/hd/materials.rs +index 32d080878..4326f23a5 100644 +--- a/crates/horizon-client/src/gfx/hd/materials.rs ++++ b/crates/horizon-client/src/gfx/hd/materials.rs +@@ -200,7 +200,7 @@ pub fn specular_enabled() -> bool { + pub fn wind_seconds() -> f32 { + static START: std::sync::OnceLock = std::sync::OnceLock::new(); + let start = START.get_or_init(std::time::Instant::now); +- (start.elapsed().as_secs_f64() % 600.0) as f32 ++ (crate::film_clock::since(*start).as_secs_f64() % 600.0) as f32 + } + + #[cfg(test)] +diff --git a/crates/horizon-client/src/gfx/hd/mod.rs b/crates/horizon-client/src/gfx/hd/mod.rs +index ccc793e9a..f7a64e7a4 100644 +--- a/crates/horizon-client/src/gfx/hd/mod.rs ++++ b/crates/horizon-client/src/gfx/hd/mod.rs +@@ -63,6 +63,7 @@ mod ao; + mod bloom; + mod frame; + mod gbuffer; ++mod ground; + mod lighting; + mod materials; + mod noise; +@@ -168,6 +169,13 @@ pub(super) fn assemble(body: &str) -> String { + &sky::SKY_FUNCS.replace("SKYBIND", &binding.to_string()), + ); + } ++ // `//PANO`: the cloud panorama (`pano_funcs.wgsl`) at binding n. ++ for binding in (0..32).rev() { ++ body = body.replace( ++ &format!("//PANO{binding}"), ++ &sky::PANO_FUNCS.replace("PANOBIND", &binding.to_string()), ++ ); ++ } + // `//SPOT`: the spot lights' cone functions (`spot.wgsl`), which call the shader's own + // `spot_air(pos)` (the air's extinction per block). + let body = body.replace("//SPOT", SPOT); +@@ -490,7 +498,7 @@ impl Hd { + /// The world is smaller than the output, so TAA upsamples it. + /// How wet the world is: soaks in over ~15 s of rain, dries out over ~2.5 minutes after it. + fn wetness(&mut self, scene: &HdScene) -> f32 { +- let now = std::time::Instant::now(); ++ let now = crate::film_clock::now(); + let dt = now.duration_since(self.wet.1).as_secs_f32().min(1.0); + let target = if scene.sky { + (scene.rain / 0.7).clamp(0.0, 1.0) +@@ -572,7 +580,7 @@ impl Hd { + view_proj: scene.view_proj.to_cols_array_2d(), + water: [ + if self.water.active { 1.0 } else { 0.0 }, +- (self.started.elapsed().as_secs_f64() % 600.0) as f32, ++ (crate::film_clock::since(self.started).as_secs_f64() % 600.0) as f32, + scene.camera_mod[0], + scene.camera_mod[1], + ], +@@ -627,6 +635,7 @@ impl Hd { + ], + smoke: self.smoke.frame.smoke, + smoke_min: self.smoke.frame.min, ++ smoke_far: self.smoke.frame.far, + smoke_lights: self.smoke.frame.lights, + spots: { + let mut all = [[0.0; 4]; 64]; +@@ -908,7 +917,10 @@ mod tests { + sources.iter().any(|s| { + let s = assemble(s); + // The sky snippet's binding number is filled in by `assemble`. +- shown.split("SKYBIND").all(|part| s.contains(part)) ++ shown ++ .split("SKYBIND") ++ .flat_map(|part| part.split("PANOBIND")) ++ .all(|part| s.contains(part)) + }) + }, + "{} is not part of any tested shader", +diff --git a/crates/horizon-client/src/gfx/hd/pano_funcs.wgsl b/crates/horizon-client/src/gfx/hd/pano_funcs.wgsl +new file mode 100644 +index 000000000..d469a1400 +--- /dev/null ++++ b/crates/horizon-client/src/gfx/hd/pano_funcs.wgsl +@@ -0,0 +1,18 @@ ++ ++// The clouds seen from the camera in every direction above the horizon (`cloud_sky` pass): light ++// and transmittance, for reflections of the sky. Azimuth from +x over the whole circle, ++// v = sqrt(elevation / (pi / 2)). ++@group(0) @binding(PANOBIND) var cloud_pano: texture_2d; ++ ++fn cloud_pano_at(dir: vec3) -> vec4 { ++ let u = atan2(dir.z, dir.x) / (2.0 * 3.14159265) + 0.5; ++ let v = sqrt(asin(clamp(dir.y, 0.0, 1.0)) / (3.14159265 * 0.5)); ++ return textureSampleLevel(cloud_pano, linear, vec2(u, v), 0.0); ++} ++ ++// A sky colour with the clouds in front of it (where the volumetric clouds are drawn). ++fn sky_with_clouds(sky: vec3, dir: vec3) -> vec3 { ++ if frame.clouds.z < 0.5 || frame.sky_sun.w < 0.5 { return sky; } ++ let c = cloud_pano_at(dir); ++ return sky * c.a + c.rgb; ++} +diff --git a/crates/horizon-client/src/gfx/hd/prelude.wgsl b/crates/horizon-client/src/gfx/hd/prelude.wgsl +index 7e937a63b..6075cbb0b 100644 +--- a/crates/horizon-client/src/gfx/hd/prelude.wgsl ++++ b/crates/horizon-client/src/gfx/hd/prelude.wgsl +@@ -27,6 +27,7 @@ struct HdFrame { + surface: vec4, + smoke: vec4, + smoke_min: vec4, ++ smoke_far: vec4, + smoke_lights: array, 32>, + spots: array, 64>, + } +diff --git a/crates/horizon-client/src/gfx/hd/sky.rs b/crates/horizon-client/src/gfx/hd/sky.rs +index 7211ffda2..f1c80a766 100644 +--- a/crates/horizon-client/src/gfx/hd/sky.rs ++++ b/crates/horizon-client/src/gfx/hd/sky.rs +@@ -34,6 +34,9 @@ pub(super) const SKY_PASS: &str = include_str!("sky.wgsl"); + /// the binding of the texture; `frame` and the `linear` sampler come before it). + pub(super) const SKY_FUNCS: &str = include_str!("sky_funcs.wgsl"); + ++/// The cloud panorama's readers (`PANOBIND` is its binding), pasted at a `//PANO` marker. ++pub(super) const PANO_FUNCS: &str = include_str!("pano_funcs.wgsl"); ++ + /// The sky pass's group 0: only the frame. + pub(super) const SKY_BINDINGS: [wgpu::BindingType; 1] = [UNIFORM]; + +diff --git a/crates/horizon-client/src/gfx/hd/smoke.rs b/crates/horizon-client/src/gfx/hd/smoke.rs +index c751df4f4..266f5fdef 100644 +--- a/crates/horizon-client/src/gfx/hd/smoke.rs ++++ b/crates/horizon-client/src/gfx/hd/smoke.rs +@@ -18,8 +18,12 @@ + //! `cloud.wgsl` thins the clouds with it. + //! + //! Contract: +-//! - Input segments (`HdSmoke`) are camera-relative, ages and lives in seconds. The grid reaches +-//! `GRID_XZ * CELL / 2` = 192 blocks round the camera horizontally, 48 below and 144 above. ++//! - Input segments (`HdSmoke`) are camera-relative, ages and lives in seconds. Two grids: the near ++//! one reaches `GRID_XZ * CELL / 2` = 192 blocks round the camera horizontally (48 below, 144 above) ++//! in 3-block cells; the far one is the same lattice in 12-block cells (`FAR_CELL`), 768 blocks ++//! (192 below, 576 above), with trails kept 7.2 blocks thick for its cells. The fog blends them ++//! over the near grid's last 8 cells (weights sum to 1: no seam) and fades the far one out over ++//! its last 6; the far grid holds up to `FAR_MAX_SEGMENTS` segments, the nearest first. + //! - The grid atlas is `Rgba16Float`, rewritten every frame the smoke is active (`active`). + //! - Nothing here changes unless the mod sends segments; `HORIZON_HD_SMOKE=0` turns it off (the mod is + //! told, and draws its own smoke). +@@ -41,6 +45,11 @@ const TILES: u32 = 8; + pub const ATLAS: u32 = GRID_XZ * TILES; + pub const ATLAS_FORMAT: wgpu::TextureFormat = wgpu::TextureFormat::Rgba16Float; + pub const MAX_SEGMENTS: usize = 3072; ++/// The far grid: the same lattice with 4x the cells (12 blocks): trails out to 768 blocks round the ++/// camera (192 below, 576 above), blended with the near one over the near grid's last cells. ++pub const FAR_CELL: f32 = 12.0; ++const FAR_MIN_TUBE: f32 = 7.2; ++pub const FAR_MAX_SEGMENTS: usize = 6144; + /// Brick-list entries: a segment is in every brick its box touches. + const MAX_INDICES: usize = 120_000; + pub const MAX_LIGHTS: usize = 16; +@@ -83,8 +92,8 @@ struct Baked { + seed: [f32; 4], + } + +-/// `fs_smoke_grid`'s group 0: frame, the segments, the brick lists. +-pub(super) const SMOKE_GRID_BINDINGS: [wgpu::BindingType; 3] = [UNIFORM, STORAGE, STORAGE]; ++/// `fs_smoke_grid`'s group 0: frame, the segments, the brick lists, the grid's corner and cell. ++pub(super) const SMOKE_GRID_BINDINGS: [wgpu::BindingType; 4] = [UNIFORM, STORAGE, STORAGE, UNIFORM]; + + pub(super) const SMOKE_GRID: &str = include_str!("smoke_grid.wgsl"); + /// The grid's trilinear lookup, shared by the fog and the clouds. Needs `frame` in scope. +@@ -95,30 +104,40 @@ pub(super) const SMOKE_SAMPLE: &str = include_str!("smoke_sample.wgsl"); + pub(super) struct SmokeFrame { + pub smoke: [f32; 4], + pub min: [f32; 4], ++ /// xyz: the far grid's corner relative to the camera; w: its cell. ++ pub far: [f32; 4], + pub lights: [[f32; 4]; 32], + } + +-pub struct Smoke { +- pub atlas: wgpu::TextureView, ++/// One level of the smoke grid: a 128 x 64 x 128 lattice of cells of its own size, its own baked ++/// segments (a trail is kept at least `min_tube` thick for the cells) and brick lists. ++struct Cascade { ++ cell: f32, ++ min_tube: f32, ++ max_segments: usize, ++ atlas: wgpu::TextureView, + segments: wgpu::Buffer, + bricks: wgpu::Buffer, +- pipeline: wgpu::RenderPipeline, ++ /// xyz: the grid's corner relative to the camera; w: the cell (for `fs_smoke_grid`). ++ grid: wgpu::Buffer, + group: wgpu::BindGroup, +- /// Segments in the grid this frame (0: nothing is drawn). +- pub count: usize, +- pub frame: SmokeFrame, ++ /// Segments in the grid this frame (0: nothing is drawn, the frame says so). ++ count: usize, ++ min: [f32; 3], + baked: Vec, + order: Vec<(f32, usize)>, + bricks_cpu: Vec, +- lights: Vec<(f32, [f32; 4], [f32; 4])>, + } + +-impl Smoke { +- pub fn new(device: &wgpu::Device, frame: &wgpu::Buffer) -> Self { +- let layout = device.create_bind_group_layout(&wgpu::BindGroupLayoutDescriptor { +- label: Some("HD smoke grid"), +- entries: &entries(&SMOKE_GRID_BINDINGS), +- }); ++impl Cascade { ++ fn new( ++ device: &wgpu::Device, ++ layout: &wgpu::BindGroupLayout, ++ frame: &wgpu::Buffer, ++ cell: f32, ++ min_tube: f32, ++ max_segments: usize, ++ ) -> Self { + let storage = |label, size: usize| { + device.create_buffer(&wgpu::BufferDescriptor { + label: Some(label), +@@ -129,22 +148,18 @@ impl Smoke { + }; + let segments = storage( + "HD smoke segments", +- MAX_SEGMENTS * std::mem::size_of::(), ++ max_segments * std::mem::size_of::(), + ); + let bricks = storage("HD smoke bricks", (BRICKS * 2 + MAX_INDICES) * 4); +- let module = module(device, "HD smoke grid", SMOKE_GRID); +- let pipeline = fullscreen( +- device, +- "HD smoke grid", +- &layout, +- &module, +- "fs_smoke_grid", +- ATLAS_FORMAT, +- None, +- ); ++ let grid = device.create_buffer(&wgpu::BufferDescriptor { ++ label: Some("HD smoke grid corner"), ++ size: 16, ++ usage: wgpu::BufferUsages::UNIFORM | wgpu::BufferUsages::COPY_DST, ++ mapped_at_creation: false, ++ }); + let group = device.create_bind_group(&wgpu::BindGroupDescriptor { + label: Some("HD smoke grid"), +- layout: &layout, ++ layout, + entries: &[ + wgpu::BindGroupEntry { + binding: 0, +@@ -158,41 +173,34 @@ impl Smoke { + binding: 2, + resource: bricks.as_entire_binding(), + }, ++ wgpu::BindGroupEntry { ++ binding: 3, ++ resource: grid.as_entire_binding(), ++ }, + ], + }); ++ let atlas = target(device, "HD smoke grid", [ATLAS, ATLAS], ATLAS_FORMAT).view; + Self { +- atlas: target(device, "HD smoke grid", [ATLAS, ATLAS], ATLAS_FORMAT).view, ++ cell, ++ min_tube, ++ max_segments, ++ atlas, + segments, + bricks, +- pipeline, ++ grid, + group, + count: 0, +- frame: SmokeFrame::default(), ++ min: [0.0; 3], + baked: Vec::new(), + order: Vec::new(), + bricks_cpu: Vec::new(), +- lights: Vec::new(), + } + } + +- /// Bakes this frame's segments, bins them into the grid's bricks and uploads them; picks the +- /// lights that glow on the smoke. `clock` is the mod's clock in seconds. +- pub fn prepare( +- &mut self, +- queue: &wgpu::Queue, +- scene: &HdScene, +- smoke: &[HdSmoke], +- lights: &[HdLight], +- clock: f32, +- ) { ++ /// Bakes the segments in reach of this level, bins them into its bricks and uploads them. ++ fn prepare(&mut self, queue: &wgpu::Queue, scene: &HdScene, smoke: &[HdSmoke]) { + self.count = 0; +- self.frame = SmokeFrame::default(); +- if std::env::var_os("HORIZON_HD_SMOKE_LOG").is_some() && !smoke.is_empty() { +- log::info!("HD smoke: {} segments given", smoke.len()); +- } +- if smoke.is_empty() { +- return; +- } ++ let cell = self.cell; + // The grid's corner on the world's lattice, relative to the camera. + let cam = [ + scene.camera_world[0], +@@ -200,21 +208,29 @@ impl Smoke { + scene.camera_world[1], + ]; + let min = [ +- (cam[0] / CELL).floor() * CELL - (GRID_XZ / 2) as f32 * CELL - cam[0], +- (cam[1] / CELL).floor() * CELL - CELLS_BELOW * CELL - cam[1], +- (cam[2] / CELL).floor() * CELL - (GRID_XZ / 2) as f32 * CELL - cam[2], ++ (cam[0] / cell).floor() * cell - (GRID_XZ / 2) as f32 * cell - cam[0], ++ (cam[1] / cell).floor() * cell - CELLS_BELOW * cell - cam[1], ++ (cam[2] / cell).floor() * cell - (GRID_XZ / 2) as f32 * cell - cam[2], + ]; ++ self.min = min; ++ queue.write_buffer( ++ &self.grid, ++ 0, ++ bytemuck::cast_slice(&[min[0], min[1], min[2], cell]), ++ ); + let max = [ +- min[0] + GRID_XZ as f32 * CELL, +- min[1] + GRID_Y as f32 * CELL, +- min[2] + GRID_XZ as f32 * CELL, ++ min[0] + GRID_XZ as f32 * cell, ++ min[1] + GRID_Y as f32 * cell, ++ min[2] + GRID_XZ as f32 * cell, + ]; + // Bake, keep the ones in reach, nearest first. + self.baked.clear(); + self.order.clear(); + for s in smoke { +- let Some(b) = bake(s) else { continue }; +- let reach = b.pa[3].max(b.extra[2]) * 1.3 + CELL; ++ let Some(b) = bake(s, self.min_tube) else { ++ continue; ++ }; ++ let reach = b.pa[3].max(b.extra[2]) * 1.3 + cell; + let lo = [ + b.pa[0].min(b.pb[0]) - reach, + b.pa[1].min(b.pb[1]) - reach, +@@ -243,12 +259,12 @@ impl Smoke { + return; + } + self.order.sort_by(|x, y| x.0.total_cmp(&y.0)); +- self.order.truncate(MAX_SEGMENTS); ++ self.order.truncate(self.max_segments); + // Bricks: count per brick, then fill; the nearest segments first, so a full list drops the + // farthest. + let brick_of = |lo: f32, hi: f32, axis: usize, bricks: u32| -> (i32, i32) { +- let a = ((lo - min[axis]) / (CELL * BRICK as f32)).floor() as i32; +- let b = ((hi - min[axis]) / (CELL * BRICK as f32)).floor() as i32; ++ let a = ((lo - min[axis]) / (cell * BRICK as f32)).floor() as i32; ++ let b = ((hi - min[axis]) / (cell * BRICK as f32)).floor() as i32; + (a.max(0), b.min(bricks as i32 - 1)) + }; + let mut counts = vec![0u32; BRICKS]; +@@ -257,7 +273,7 @@ impl Smoke { + let mut kept: Vec = Vec::with_capacity(self.order.len()); + for &(_, i) in &self.order { + let b = self.baked[i]; +- let reach = b.pa[3].max(b.extra[2]) * 1.3 + CELL; ++ let reach = b.pa[3].max(b.extra[2]) * 1.3 + cell; + let (x0, x1) = brick_of( + b.pa[0].min(b.pb[0]) - reach, + b.pa[0].max(b.pb[0]) + reach, +@@ -321,17 +337,91 @@ impl Smoke { + queue.write_buffer(&self.segments, 0, bytemuck::cast_slice(&kept)); + queue.write_buffer(&self.bricks, 0, bytemuck::cast_slice(&self.bricks_cpu)); + self.count = kept.len(); ++ } ++} ++ ++pub struct Smoke { ++ /// The near grid (3-block cells) and the far one (12-block cells), as the fog reads them. ++ pub atlas: wgpu::TextureView, ++ pub far_atlas: wgpu::TextureView, ++ near: Cascade, ++ far: Cascade, ++ pipeline: wgpu::RenderPipeline, ++ /// Segments in the near grid this frame. ++ pub count: usize, ++ pub frame: SmokeFrame, ++ lights: Vec<(f32, [f32; 4], [f32; 4])>, ++} ++ ++impl Smoke { ++ pub fn new(device: &wgpu::Device, frame: &wgpu::Buffer) -> Self { ++ let layout = device.create_bind_group_layout(&wgpu::BindGroupLayoutDescriptor { ++ label: Some("HD smoke grid"), ++ entries: &entries(&SMOKE_GRID_BINDINGS), ++ }); ++ let module = module(device, "HD smoke grid", SMOKE_GRID); ++ let pipeline = fullscreen( ++ device, ++ "HD smoke grid", ++ &layout, ++ &module, ++ "fs_smoke_grid", ++ ATLAS_FORMAT, ++ None, ++ ); ++ let near = Cascade::new(device, &layout, frame, CELL, MIN_TUBE, MAX_SEGMENTS); ++ let far = Cascade::new( ++ device, ++ &layout, ++ frame, ++ FAR_CELL, ++ FAR_MIN_TUBE, ++ FAR_MAX_SEGMENTS, ++ ); ++ Self { ++ atlas: near.atlas.clone(), ++ far_atlas: far.atlas.clone(), ++ near, ++ far, ++ pipeline, ++ count: 0, ++ frame: SmokeFrame::default(), ++ lights: Vec::new(), ++ } ++ } ++ ++ /// Bakes this frame's segments into both grids and uploads them; picks the lights that glow on ++ /// the smoke. `clock` is the mod's clock in seconds. ++ pub fn prepare( ++ &mut self, ++ queue: &wgpu::Queue, ++ scene: &HdScene, ++ smoke: &[HdSmoke], ++ lights: &[HdLight], ++ clock: f32, ++ ) { ++ self.count = 0; ++ self.near.count = 0; ++ self.far.count = 0; ++ self.frame = SmokeFrame::default(); ++ if std::env::var_os("HORIZON_HD_SMOKE_LOG").is_some() && !smoke.is_empty() { ++ log::info!("HD smoke: {} segments given", smoke.len()); ++ } ++ if smoke.is_empty() { ++ return; ++ } ++ self.near.prepare(queue, scene, smoke); ++ self.far.prepare(queue, scene, smoke); ++ self.count = self.near.count; ++ if self.near.count == 0 && self.far.count == 0 { ++ return; ++ } + if std::env::var_os("HORIZON_HD_SMOKE_LOG").is_some() { +- let n = &self.baked[0]; + log::info!( +- "HD smoke: {} in, {} baked, {} in the grid; first pa {:?} pb {:?} extra {:?} min {:?}", ++ "HD smoke: {} given, {} in the near grid, {} in the far grid", + smoke.len(), +- self.baked.len(), +- self.count, +- n.pa, +- n.pb, +- n.extra, +- min ++ self.near.count, ++ self.far.count + ); + } + // The lights that glow on the smoke: the brightest near ones. +@@ -347,9 +437,17 @@ impl Smoke { + } + self.lights.sort_by(|a, b| b.0.total_cmp(&a.0)); + self.lights.truncate(MAX_LIGHTS); ++ let (n, f) = (&self.near, &self.far); + let mut out = SmokeFrame { +- smoke: [1.0, CELL, clock.rem_euclid(86_400.0), 0.0], +- min: [min[0], min[1], min[2], self.lights.len() as f32], ++ // x: the near grid has smoke, w: the far one has. ++ smoke: [ ++ if n.count > 0 { 1.0 } else { 0.0 }, ++ CELL, ++ clock.rem_euclid(86_400.0), ++ if f.count > 0 { 1.0 } else { 0.0 }, ++ ], ++ min: [n.min[0], n.min[1], n.min[2], self.lights.len() as f32], ++ far: [f.min[0], f.min[1], f.min[2], FAR_CELL], + lights: [[0.0; 4]; 32], + }; + for (i, (_, pos, color)) in self.lights.iter().enumerate() { +@@ -364,23 +462,40 @@ impl Smoke { + self.frame = out; + } + +- /// Fills the grid from the segments (when there are any). ++ /// Fills the near grid from the segments (when it has any). + pub fn draw( + &self, + encoder: &mut wgpu::CommandEncoder, + stamp: Option>, + ) { +- if self.count == 0 { +- return; ++ if self.near.count > 0 { ++ stamped_pass( ++ encoder, ++ "HD smoke grid", ++ &[&self.near.atlas], ++ &self.pipeline, ++ &self.near.group, ++ stamp, ++ ); ++ } ++ } ++ ++ /// Fills the far grid. ++ pub fn draw_far( ++ &self, ++ encoder: &mut wgpu::CommandEncoder, ++ stamp: Option>, ++ ) { ++ if self.far.count > 0 { ++ stamped_pass( ++ encoder, ++ "HD smoke grid far", ++ &[&self.far.atlas], ++ &self.pipeline, ++ &self.far.group, ++ stamp, ++ ); + } +- stamped_pass( +- encoder, +- "HD smoke grid", +- &[&self.atlas], +- &self.pipeline, +- &self.group, +- stamp, +- ); + } + } + +@@ -389,7 +504,7 @@ fn brick_index(x: u32, y: u32, z: u32) -> usize { + } + + /// A segment at its age: drifted with the wind, risen, grown, thinned, cooled; None once spent. +-fn bake(s: &HdSmoke) -> Option { ++fn bake(s: &HdSmoke, min_tube: f32) -> Option { + let t = s.a[3]; + let life = s.b[3].max(0.05); + if !(t >= 0.0) || t >= life { +@@ -409,8 +524,8 @@ fn bake(s: &HdSmoke) -> Option { + // the same mass per length, so a young trail is a continuous ribbon. + let d = [s.b[0] - s.a[0], s.b[1] - s.a[1], s.b[2] - s.a[2]]; + let tube = d[0] * d[0] + d[1] * d[1] + d[2] * d[2] > 0.25; +- let (radius, density) = if tube && radius < MIN_TUBE { +- (MIN_TUBE, density * radius / MIN_TUBE) ++ let (radius, density) = if tube && radius < min_tube { ++ (min_tube, density * radius / min_tube) + } else { + (radius, density) + }; +@@ -458,23 +573,26 @@ mod tests { + + #[test] + fn a_segment_grows_thins_and_ends() { +- let young = bake(&puff(1.0, 40.0)).unwrap(); +- let old = bake(&puff(30.0, 40.0)).unwrap(); ++ let young = bake(&puff(1.0, 40.0), MIN_TUBE).unwrap(); ++ let old = bake(&puff(30.0, 40.0), MIN_TUBE).unwrap(); + assert!(old.pa[3] > young.pa[3], "grows"); + assert!(old.pb[3] < young.pb[3], "thins"); + assert!( + old.pa[0] > young.pa[0] && old.pa[1] > young.pa[1], + "drifts and rises" + ); +- assert!(bake(&puff(40.0, 40.0)).is_none(), "gone at its life"); +- assert!(bake(&puff(-1.0, 40.0)).is_none(), "not born yet"); ++ assert!( ++ bake(&puff(40.0, 40.0), MIN_TUBE).is_none(), ++ "gone at its life" ++ ); ++ assert!(bake(&puff(-1.0, 40.0), MIN_TUBE).is_none(), "not born yet"); + } + + #[test] + fn the_same_age_bakes_the_same() { + // Showing a frame again (a pause, a seek back to it) gives the same smoke. +- let a = bake(&puff(12.5, 40.0)).unwrap(); +- let b = bake(&puff(12.5, 40.0)).unwrap(); ++ let a = bake(&puff(12.5, 40.0), MIN_TUBE).unwrap(); ++ let b = bake(&puff(12.5, 40.0), MIN_TUBE).unwrap(); + assert_eq!(bytemuck::bytes_of(&a), bytemuck::bytes_of(&b)); + } + +@@ -483,7 +601,7 @@ mod tests { + let mut s = puff(10.0, 40.0); + s.shape[2] = 0.0; + s.motion[1] = 3.0; +- let b = bake(&s).unwrap(); ++ let b = bake(&s, MIN_TUBE).unwrap(); + assert!(b.extra[3] > 0.5 && b.extra[2] >= 3.0); + } + } +diff --git a/crates/horizon-client/src/gfx/hd/smoke_grid.wgsl b/crates/horizon-client/src/gfx/hd/smoke_grid.wgsl +index 0adcd55f6..d44733aeb 100644 +--- a/crates/horizon-client/src/gfx/hd/smoke_grid.wgsl ++++ b/crates/horizon-client/src/gfx/hd/smoke_grid.wgsl +@@ -1,4 +1,4 @@ +-// The smoke grid: one texel of a 1024 x 1024 atlas per cell of a 128 x 64 x 128 lattice (64 slices ++// The smoke grid (two cascades share this shader): one texel of a 1024 x 1024 atlas per cell of a 128 x 64 x 128 lattice (64 slices + // of 128 x 128, 8 to a row). Each cell sums the capsules of its 8-cell brick. + // r density, g soot x density, b heat x density, a clear amount (the largest of the tunnels). + // Segments: 4 vec4 each (see smoke.rs `Baked`); bricks: (start, count) per brick, then the indices. +@@ -6,6 +6,8 @@ + @group(0) @binding(0) var frame: HdFrame; + @group(0) @binding(1) var segs: array>; + @group(0) @binding(2) var bricks: array; ++// xyz: the grid's corner relative to the camera; w: its cell in blocks (one per cascade). ++@group(0) @binding(3) var grid: vec4; + + const BRICKS_XZ: u32 = 16u; + const BRICK_LISTS: u32 = 4096u; +@@ -15,7 +17,7 @@ fn fs_smoke_grid(in: FullOut) -> @location(0) vec4 { + let px = vec2(in.position.xy); + let tile = px / 128u; + let c = vec3(px.x % 128u, tile.y * 8u + tile.x, px.y % 128u); +- let p = frame.smoke_min.xyz + (vec3(c) + vec3(0.5)) * frame.smoke.y; ++ let p = grid.xyz + (vec3(c) + vec3(0.5)) * grid.w; + let b = (c.x >> 3u) + BRICKS_XZ * ((c.z >> 3u) + BRICKS_XZ * (c.y >> 3u)); + let start = bricks[2u * b]; + let count = bricks[2u * b + 1u]; +diff --git a/crates/horizon-client/src/gfx/hd/smoke_sample.wgsl b/crates/horizon-client/src/gfx/hd/smoke_sample.wgsl +index 024a1ac8e..14c7622f7 100644 +--- a/crates/horizon-client/src/gfx/hd/smoke_sample.wgsl ++++ b/crates/horizon-client/src/gfx/hd/smoke_sample.wgsl +@@ -6,6 +6,35 @@ fn smoke_slice(tex: texture_2d, s: sampler, x: f32, z: f32, y: f32) -> vec4 + return textureSampleLevel(tex, s, (tile * 128.0 + vec2(x + 0.5, z + 0.5)) / 1024.0, 0.0); + } + ++// A cascade of the grid read trilinearly: `gmin` its corner relative to the camera, `cell` its cell ++// size. Zero outside, no fade at the edge. ++fn smoke_raw(tex: texture_2d, s: sampler, p: vec3, gmin: vec3, cell: f32) -> vec4 { ++ let g = (p - gmin) / cell - vec3(0.5); ++ if g.x < 0.0 || g.z < 0.0 || g.y < 0.0 || g.x > 127.0 || g.z > 127.0 || g.y > 63.0 { ++ return vec4(0.0); ++ } ++ let y0 = floor(g.y); ++ let y1 = min(y0 + 1.0, 63.0); ++ let a = smoke_slice(tex, s, g.x, g.z, y0); ++ let b = smoke_slice(tex, s, g.x, g.z, y1); ++ return mix(a, b, g.y - y0); ++} ++ ++// The far cascade (12-block cells), fading out over its last 6 cells. ++fn smoke_far_at(tex: texture_2d, s: sampler, p: vec3) -> vec4 { ++ let g = (p - frame.smoke_far.xyz) / frame.smoke_far.w - vec3(0.5); ++ let edge = min(min(g.x, 127.0 - g.x), min(g.z, 127.0 - g.z)); ++ return smoke_raw(tex, s, p, frame.smoke_far.xyz, frame.smoke_far.w) * smoothstep(0.0, 6.0, edge); ++} ++ ++// How much the near grid covers a point: 1 inside, easing to 0 over its last 8 cells on every side ++// (the far grid takes the rest, so the two sum to the smoke once). ++fn smoke_near_cover(p: vec3) -> f32 { ++ let g = (p - frame.smoke_min.xyz) / frame.smoke.y - vec3(0.5); ++ let edge = min(min(min(g.x, 127.0 - g.x), min(g.z, 127.0 - g.z)), min(g.y, 63.0 - g.y)); ++ return smoothstep(0.0, 8.0, edge); ++} ++ + fn smoke_at(tex: texture_2d, s: sampler, p: vec3) -> vec4 { + let g = (p - frame.smoke_min.xyz) / frame.smoke.y - vec3(0.5); + if g.x < 0.0 || g.z < 0.0 || g.y < 0.0 || g.x > 127.0 || g.z > 127.0 || g.y > 63.0 { +diff --git a/crates/horizon-client/src/gfx/hd/volumes.rs b/crates/horizon-client/src/gfx/hd/volumes.rs +index d3b55e2f2..fd88b9ece 100644 +--- a/crates/horizon-client/src/gfx/hd/volumes.rs ++++ b/crates/horizon-client/src/gfx/hd/volumes.rs +@@ -24,6 +24,7 @@ + //! multiple-scattering octaves, the light march with growing steps) and the fog's phase mix and + //! evening glow are ported from Photon by sixthsurge (MIT, see THIRD_PARTY_PHOTON.md), shaders/include/sky/clouds/{common,cumulus}.glsl, shaders/include/lighting/cloud_shadows.glsl and shaders/include/fog/air_fog_vl.glsl at commit 26c2906. + ++use super::ground::Ground; + use super::noise as hd_noise; + use super::{ + DEPTH, FLOAT, Hd, SAMPLER, SHADOW_ARRAY, SHADOW_SAMPLER, UNFILTERED, UNIFORM, entries, +@@ -36,6 +37,8 @@ pub const FOG_FORMAT: wgpu::TextureFormat = wgpu::TextureFormat::Rgba16Float; + pub const FOG_DIST_FORMAT: wgpu::TextureFormat = wgpu::TextureFormat::R16Float; + /// The cloud shadow map's side in texels, and its half size in blocks (the same in `fs_light`). + pub const SHADOW_SIZE: u32 = 256; ++/// The cloud panorama (the sky's clouds in every direction, for reflections): azimuths by elevations. ++pub const PANO_SIZE: [u32; 2] = [256, 64]; + pub const SHADOW_RADIUS: f32 = 1200.0; + /// Vanilla's cloud base height; the volumetric layer stands on it. + pub const CLOUD_BASE: f32 = 192.33; +@@ -89,6 +92,12 @@ pub struct HdVolumes { + /// How far each cloud texel's ray was marched (ping-pong with `clouds`). + cloud_dist: [wgpu::TextureView; 2], + cloud_depth: Option, ++ /// The cloud panorama and its history (ping-pong with `clouds`, the same flip). ++ pano: [wgpu::TextureView; 2], ++ pano_pipeline: wgpu::RenderPipeline, ++ pano_groups: Option<[wgpu::BindGroup; 2]>, ++ /// The ground's height map for the fog (`ground.rs`). ++ pub ground: Ground, + flip: usize, + history_ready: bool, + pub cloud_shadow: wgpu::TextureView, +@@ -123,7 +132,7 @@ pub(super) const CLOUD_SHADOW_BINDINGS: [wgpu::BindingType; 6] = + [UNIFORM, D3, FLOAT, SAMPLER, SAMPLER, FLOAT]; + /// `fs_fog`'s group 0: frame, the world's depth, the shadow cascades and their sampler, 3D noise, + /// repeating and clamped samplers, the sky texture. +-pub(super) const FOG_BINDINGS: [wgpu::BindingType; 9] = [ ++pub(super) const FOG_BINDINGS: [wgpu::BindingType; 11] = [ + UNIFORM, + DEPTH, + SHADOW_ARRAY, +@@ -133,6 +142,8 @@ pub(super) const FOG_BINDINGS: [wgpu::BindingType; 9] = [ + SAMPLER, + FLOAT, + FLOAT, ++ FLOAT, ++ FLOAT, + ]; + + impl HdVolumes { +@@ -256,6 +267,38 @@ impl HdVolumes { + cache: None, + }) + }; ++ let pano_pipeline = { ++ let layout = device.create_pipeline_layout(&wgpu::PipelineLayoutDescriptor { ++ label: Some("HD cloud sky"), ++ bind_group_layouts: &[Some(&cloud_layout)], ++ ..Default::default() ++ }); ++ device.create_render_pipeline(&wgpu::RenderPipelineDescriptor { ++ label: Some("HD cloud sky"), ++ layout: Some(&layout), ++ vertex: wgpu::VertexState { ++ module: &cloud_module, ++ entry_point: Some("vs_full"), ++ compilation_options: Default::default(), ++ buffers: &[], ++ }, ++ fragment: Some(wgpu::FragmentState { ++ module: &cloud_module, ++ entry_point: Some("fs_cloud_sky"), ++ compilation_options: Default::default(), ++ targets: &[Some(wgpu::ColorTargetState { ++ format: CLOUD_FORMAT, ++ blend: None, ++ write_mask: wgpu::ColorWrites::ALL, ++ })], ++ }), ++ primitive: Default::default(), ++ depth_stencil: None, ++ multisample: Default::default(), ++ multiview_mask: None, ++ cache: None, ++ }) ++ }; + let shadow_pipeline = fullscreen( + device, + "HD cloud shadows", +@@ -320,6 +363,13 @@ impl HdVolumes { + one("HD cloud distance", [1, 1], FOG_DIST_FORMAT), + ], + cloud_depth: None, ++ pano: [ ++ one("HD cloud sky", PANO_SIZE, CLOUD_FORMAT), ++ one("HD cloud sky", PANO_SIZE, CLOUD_FORMAT), ++ ], ++ pano_pipeline, ++ pano_groups: None, ++ ground: Ground::new(device, queue), + flip: 0, + history_ready: false, + cloud_shadow: one( +@@ -358,6 +408,7 @@ impl HdVolumes { + self.fog_dist = one("HD fog distance", FOG_DIST_FORMAT); + self.history_ready = false; + self.cloud_groups = None; ++ self.pano_groups = None; + self.shadow_group = None; + self.fog_group = None; + } +@@ -380,6 +431,11 @@ impl HdVolumes { + &self.clouds[self.flip] + } + ++ /// The cloud panorama written last: what the reflections read. ++ pub fn pano_view(&self) -> &wgpu::TextureView { ++ &self.pano[self.flip] ++ } ++ + /// The march lengths that go with `cloud_view`. + pub fn cloud_dist_view(&self) -> &wgpu::TextureView { + &self.cloud_dist[self.flip] +@@ -419,6 +475,7 @@ impl HdVolumes { + ) { + if self.cloud_depth.as_ref() != Some(depth) { + self.cloud_groups = None; ++ self.pano_groups = None; + self.cloud_depth = Some(depth.clone()); + } + if self.shadow_group.is_none() { +@@ -475,6 +532,56 @@ impl HdVolumes { + }); + self.cloud_groups = Some(groups); + } ++ if self.pano_groups.is_none() { ++ let layout = self.cloud_layout.clone(); ++ let (n3, n2, clamp, repeat) = ( ++ self.noise3.clone(), ++ self.noise2.clone(), ++ self.clamp.clone(), ++ self.repeat.clone(), ++ ); ++ let pano = self.pano.clone(); ++ let dist = self.cloud_dist[0].clone(); ++ let groups = [0, 1].map(|read| { ++ self.group( ++ device, ++ "HD cloud sky", ++ &layout, ++ &[ ++ wgpu::BindingResource::Buffer(frame.as_entire_buffer_binding()), ++ wgpu::BindingResource::TextureView(&n3), ++ wgpu::BindingResource::TextureView(&n2), ++ wgpu::BindingResource::Sampler(&clamp), ++ wgpu::BindingResource::Sampler(&repeat), ++ wgpu::BindingResource::TextureView(sky_lut), ++ wgpu::BindingResource::TextureView(&pano[read]), ++ wgpu::BindingResource::TextureView(atlas), ++ wgpu::BindingResource::TextureView(depth), ++ wgpu::BindingResource::TextureView(&dist), ++ ], ++ ) ++ }); ++ self.pano_groups = Some(groups); ++ } ++ } ++ ++ /// The cloud panorama (a small texture, every frame, blended with the last). ++ pub fn draw_cloud_sky( ++ &mut self, ++ encoder: &mut wgpu::CommandEncoder, ++ stamp: Option>, ++ ) { ++ if let Some(groups) = &self.pano_groups { ++ let (read, write) = (self.flip, 1 - self.flip); ++ stamped_pass( ++ encoder, ++ "HD cloud sky", ++ &[&self.pano[write]], ++ &self.pano_pipeline, ++ &groups[read], ++ stamp, ++ ); ++ } + } + + /// The cloud shadow map. +@@ -526,10 +633,12 @@ impl HdVolumes { + shadow_array: &wgpu::TextureView, + sky_lut: &wgpu::TextureView, + atlas: &wgpu::TextureView, ++ far_atlas: &wgpu::TextureView, + stamp: Option>, + ) { + if self.fog_group.as_ref().is_none_or(|(v, _)| v != depth) { + let layout = self.fog_layout.clone(); ++ let ground = self.ground.view.clone(); + let (n3, clamp, repeat, cmp) = ( + self.noise3.clone(), + self.clamp.clone(), +@@ -550,6 +659,8 @@ impl HdVolumes { + wgpu::BindingResource::Sampler(&clamp), + wgpu::BindingResource::TextureView(sky_lut), + wgpu::BindingResource::TextureView(atlas), ++ wgpu::BindingResource::TextureView(&ground), ++ wgpu::BindingResource::TextureView(far_atlas), + ], + ); + self.fog_group = Some((depth.clone(), group)); +@@ -568,6 +679,20 @@ impl HdVolumes { + } + + impl Hd { ++ /// Refreshes the fog's ground map for a camera at world (`x`, `z`); `top` is one above a column's ++ /// highest block. A few hundred cells a frame; call before `write`. ++ pub fn write_ground( ++ &mut self, ++ queue: &wgpu::Queue, ++ x: f64, ++ z: f64, ++ top: &dyn Fn(i32, i32) -> i32, ++ ) { ++ if fog_enabled() { ++ self.volumes.ground.update(queue, x, z, top); ++ } ++ } ++ + /// The volumetric clouds (with their shadow map) and the fog, before the lighting reads them. + pub fn volumes( + &mut self, +@@ -585,6 +710,8 @@ impl Hd { + ); + self.volumes + .draw_cloud_shadow(encoder, stamp(&mut self.timing, "hd cloud shadows")); ++ self.volumes ++ .draw_cloud_sky(encoder, stamp(&mut self.timing, "hd cloud sky")); + self.volumes + .draw_clouds(encoder, stamp(&mut self.timing, "hd clouds")); + } else { +@@ -593,6 +720,8 @@ impl Hd { + if self.fog_active { + self.smoke + .draw(encoder, stamp(&mut self.timing, "hd smoke grid")); ++ self.smoke ++ .draw_far(encoder, stamp(&mut self.timing, "hd smoke grid far")); + self.volumes.draw_fog( + device, + encoder, +@@ -601,6 +730,7 @@ impl Hd { + &self.shadows.array, + &self.sky.lut, + &self.smoke.atlas, ++ &self.smoke.far_atlas, + stamp(&mut self.timing, "hd fog"), + ); + } +@@ -636,8 +766,14 @@ mod tests { + #[test] + fn noise_scales_divide_the_camera_wrap() { + let mut found = 0; +- for (name, src) in [("cloud_common", CLOUD_COMMON), ("fog", FOG)] { +- for key in ["w / ", "p3 / "] { ++ for (name, src) in [ ++ ("cloud_common", CLOUD_COMMON), ++ ("cloud", CLOUD), ++ ("fog", FOG), ++ ] { ++ for key in [ ++ "w / ", "p3 / ", "wxz / ", "cir.x / ", "cir.y / ", "cw.x / ", "cw.y / ", ++ ] { + for part in src.split(key).skip(1) { + let num: String = part + .chars() +@@ -654,7 +790,7 @@ mod tests { + } + } + } +- assert!(found >= 8, "found only {found} noise lookups"); ++ assert!(found >= 16, "found only {found} noise lookups"); + } + + /// The cloud noise's height is measured from the layer's base, not from the camera: the same +diff --git a/crates/horizon-client/src/gfx/hd/water.rs b/crates/horizon-client/src/gfx/hd/water.rs +index da972c5f2..403892348 100644 +--- a/crates/horizon-client/src/gfx/hd/water.rs ++++ b/crates/horizon-client/src/gfx/hd/water.rs +@@ -31,7 +31,7 @@ pub const WATER_NORMAL: wgpu::TextureFormat = wgpu::TextureFormat::Rgba8Unorm; + pub(super) const WATER: &str = include_str!("water.wgsl"); + /// The composite's group 0: frame, lit, G-buffer depth, water colour, normal, depth, shadow array + /// and sampler, lightmap, linear sampler, sky texture, air. +-pub(super) const WATER_BINDINGS: [wgpu::BindingType; 12] = [ ++pub(super) const WATER_BINDINGS: [wgpu::BindingType; 13] = [ + UNIFORM, + FLOAT, + DEPTH, +@@ -44,6 +44,7 @@ pub(super) const WATER_BINDINGS: [wgpu::BindingType; 12] = [ + SAMPLER, + FLOAT, + UNFILTERED, ++ FLOAT, + ]; + + /// The water effect is on unless `HORIZON_HD_WATER=0`. +@@ -60,7 +61,8 @@ pub(super) struct Water { + composite: wgpu::TextureView, + layout: wgpu::BindGroupLayout, + pipeline: wgpu::RenderPipeline, +- group: Option<((wgpu::TextureView, wgpu::Sampler), wgpu::BindGroup)>, ++ /// One group per flip of the cloud panorama it reads. ++ group: [Option<((wgpu::TextureView, wgpu::Sampler), wgpu::BindGroup)>; 2], + /// The water effect runs this frame (the scene allows it and there is translucent terrain on + /// screen), and `lit_view` is the composite. + pub(super) active: bool, +@@ -82,7 +84,7 @@ impl Water { + composite: target(device, "HD lit with water", [1, 1], HDR).view, + layout, + pipeline, +- group: None, ++ group: [None, None], + active: false, + composited: false, + } +@@ -94,7 +96,7 @@ impl Water { + self.normal = target(device, "HD water normal", size, WATER_NORMAL).view; + self.depth = target(device, "HD water depth", size, DEPTH_FORMAT).view; + self.composite = target(device, "HD lit with water", size, HDR).view; +- self.group = None; ++ self.group = [None, None]; + } + + /// The nearest water surface's depth (0 where there is none), for the lighting. +@@ -170,7 +172,11 @@ impl Hd { + return; + } + let key = (lightmap.0.clone(), lightmap.1.clone()); +- if self.water.group.as_ref().is_none_or(|(k, _)| *k != key) { ++ let flip = self.volumes.flip_index(); ++ if self.water.group[flip] ++ .as_ref() ++ .is_none_or(|(k, _)| *k != key) ++ { + let group = self.make_group( + device, + "HD water", +@@ -188,11 +194,12 @@ impl Hd { + wgpu::BindingResource::Sampler(&self.sampler), + wgpu::BindingResource::TextureView(&self.sky.lut), + wgpu::BindingResource::TextureView(&self.lighting.air), ++ wgpu::BindingResource::TextureView(self.volumes.pano_view()), + ], + ); +- self.water.group = Some((key, group)); ++ self.water.group[flip] = Some((key, group)); + } +- let Some((_, group)) = &self.water.group else { ++ let Some((_, group)) = &self.water.group[flip] else { + return; + }; + Self::draw( +diff --git a/crates/horizon-client/src/gfx/hd/water.wgsl b/crates/horizon-client/src/gfx/hd/water.wgsl +index a1a30897d..69e295980 100644 +--- a/crates/horizon-client/src/gfx/hd/water.wgsl ++++ b/crates/horizon-client/src/gfx/hd/water.wgsl +@@ -16,6 +16,7 @@ const REFLECT_RANGE: f32 = 96.0; + // What the lighting left beside the lit world: over water the air in front of the surface (scattered + // light, transmittance), in front of the water the lit floor. + @group(0) @binding(11) var air_tex: texture_2d; ++//PANO12 + + fn ign(px: vec2) -> f32 { + let p = px + vec2(5.588238 * frame.params.w); +@@ -131,7 +132,7 @@ fn linear_fog(d: f32, start: f32, end: f32) -> f32 { + fn sky_along(r: vec3, vis: f32) -> vec3 { + var c = frame.fog_color.rgb; + if frame.sky_sun.w > 0.5 { +- c = atmosphere_sky(r); ++ c = sky_with_clouds(atmosphere_sky(r), r); + } else if frame.sky_color.w > 0.5 { + c = mix(frame.fog_color.rgb, frame.sky_color.rgb, smoothstep(0.0, 0.5, r.y)); + } +diff --git a/crates/horizon-client/src/gfx/mod_post.rs b/crates/horizon-client/src/gfx/mod_post.rs +index 3d67ff25b..057878a8e 100644 +--- a/crates/horizon-client/src/gfx/mod_post.rs ++++ b/crates/horizon-client/src/gfx/mod_post.rs +@@ -303,7 +303,7 @@ impl ModPost { + 1.0 / size[1].max(1) as f32, + ], + time: [ +- self.start.elapsed().as_secs_f32() % 3600.0, ++ crate::film_clock::since(self.start).as_secs_f32() % 3600.0, + partial, + sun[1], + 0.0, +diff --git a/crates/horizon-client/src/gfx/native_post.rs b/crates/horizon-client/src/gfx/native_post.rs +index bf4293157..52a63c1b0 100644 +--- a/crates/horizon-client/src/gfx/native_post.rs ++++ b/crates/horizon-client/src/gfx/native_post.rs +@@ -85,7 +85,7 @@ impl NativeFrame { + + /// Writes this frame's inputs, for a world of `size`. + pub fn write(&mut self, queue: &wgpu::Queue, frame: &Frame, size: [u32; 2]) { +- let seconds = self.start.elapsed().as_secs_f32() % 3600.0; ++ let seconds = crate::film_clock::since(self.start).as_secs_f32() % 3600.0; + let inputs = frame_inputs(frame, size, seconds, self.frames); + self.frames = self.frames.wrapping_add(1); + queue.write_buffer(&self.buffer, 0, bytemuck::bytes_of(&inputs)); +diff --git a/crates/horizon-client/src/gfx/pack_uniforms.rs b/crates/horizon-client/src/gfx/pack_uniforms.rs +index 4da492b00..665c0111f 100644 +--- a/crates/horizon-client/src/gfx/pack_uniforms.rs ++++ b/crates/horizon-client/src/gfx/pack_uniforms.rs +@@ -277,7 +277,7 @@ fn smooth(value: f32, target: f32, half_life: f32, dt: f32) -> f32 { + impl FrameUniforms { + /// This frame's values for a render size of `size` pixels. + pub fn update(&mut self, frame: &Frame, inputs: &PackInputs, size: [u32; 2]) { +- let now = std::time::Instant::now(); ++ let now = crate::film_clock::now(); + let dt = self.last.map_or(0.0, |l| (now - l).as_secs_f32()); + self.last = Some(now); + let aspect = size[0] as f32 / size[1].max(1) as f32; +diff --git a/crates/horizon-client/src/lib.rs b/crates/horizon-client/src/lib.rs +index d4ef4c209..58afe409e 100644 +--- a/crates/horizon-client/src/lib.rs ++++ b/crates/horizon-client/src/lib.rs +@@ -63,6 +63,7 @@ pub mod extras; + pub mod extras_hud; + pub mod falling_block; + pub mod fast_hash; ++pub mod film_clock; + pub mod fire_render; + pub mod first_person; + pub mod flatgen; +@@ -181,6 +182,7 @@ pub mod weather; + pub mod widgets; + pub mod win_screen; + pub mod world; ++pub mod world_log; + pub mod world_spawn; + pub mod worldborder; + pub mod zip; +diff --git a/crates/horizon-client/src/world.rs b/crates/horizon-client/src/world.rs +index f2d636ac8..40ecbdf7d 100644 +--- a/crates/horizon-client/src/world.rs ++++ b/crates/horizon-client/src/world.rs +@@ -105,6 +105,10 @@ pub struct World { + /// The sections whose blocks changed since a mod last asked, kept only + /// while a mod watches (`render.world-changes`). + pub mod_changes: ModChanges, ++ /// AirDef fork: the log of block changes a mod asked for (`render.world-log-start`) and the ++ /// game tick the changes are stamped with. ++ pub log: Option, ++ pub log_tick: u64, + } + /// The block changes a mod's cache of the world must hear of. + #[derive(Default)] +@@ -227,6 +231,8 @@ impl World { + pois: Default::default(), + epoch: NEXT_EPOCH.fetch_add(1, std::sync::atomic::Ordering::Relaxed), + mod_changes: ModChanges::default(), ++ log: None, ++ log_tick: 0, + } + } + /// A controlled blockstate scene for the native scene probes: material +@@ -290,14 +296,35 @@ impl World { + /// section borders) for remeshing and the surrounding chunks for relighting. + /// Neighbour updates, drops and block entities belong to the gameplay layer. + pub fn set(&mut self, x: i32, y: i32, z: i32, state: BlockStateId) -> crate::Result<()> { +- let Some(chunk) = self.chunks.get_mut(&(x >> 4, z >> 4)) else { ++ if self.chunks.get(&(x >> 4, z >> 4)).is_none() { + return Err("write outside resident chunks".into()); +- }; ++ } + if y < MIN_Y || y >= MIN_Y + (SECTIONS as i32) * 16 { + return Err("write outside world height".into()); + } +- let previous = Arc::make_mut(chunk).set(x & 15, y, z & 15, state.0); ++ // A mod's view of an earlier time keeps the blocks it shows: a real change is logged and ++ // held back (the state before it is the real one) until the view moves past it. ++ let deferred = self ++ .log ++ .as_ref() ++ .and_then(|l| l.deferred([x, y, z], self.block(x, y, z).0)); ++ let previous = match deferred { ++ Some(real) => real, ++ None => { ++ let chunk = self.chunks.get_mut(&(x >> 4, z >> 4)).expect("checked"); ++ Arc::make_mut(chunk).set(x & 15, y, z & 15, state.0) ++ } ++ }; + if previous != state.0 { ++ if let Some(log) = &mut self.log { ++ log.record( ++ self.log_tick, ++ [x, y, z], ++ previous, ++ state.0, ++ deferred.is_some(), ++ ); ++ } + self.block_entities + .state_changed((x, y, z), previous, state.0); + let watches = |id: u32| self.watched.get(id as usize).copied().unwrap_or(false); +@@ -312,32 +339,90 @@ impl World { + log.push((x, y, z)); + } + self.modified.insert((x >> 4, z >> 4)); +- let sy = (y - MIN_Y) >> 4; +- for dz in -1..=1 { +- for dy in -1..=1 { +- for dx in -1..=1 { +- let (bx, by, bz) = (x + dx, y + dy, z + dz); +- let s = (by - MIN_Y) >> 4; +- if !(0..SECTIONS as i32).contains(&s) { +- continue; +- } +- self.dirty_sections.insert((bx >> 4, s, bz >> 4)); ++ if deferred.is_none() { ++ self.touched(x, y, z, previous, state.0); ++ } ++ } ++ Ok(()) ++ } ++ /// Marks what a written block changes: the sections to remesh (and their neighbours on a ++ /// border) and the light. ++ fn touched(&mut self, x: i32, y: i32, z: i32, previous: u32, state: u32) { ++ for dz in -1..=1 { ++ for dy in -1..=1 { ++ for dx in -1..=1 { ++ let (bx, by, bz) = (x + dx, y + dy, z + dz); ++ let s = (by - MIN_Y) >> 4; ++ if !(0..SECTIONS as i32).contains(&s) { ++ continue; + } ++ self.dirty_sections.insert((bx >> 4, s, bz >> 4)); + } + } +- let _ = sy; +- if self.chunks.get(&(x >> 4, z >> 4)).is_some_and(|c| c.lit) { +- self.light_edits.push(((x, y, z), previous, state.0)); +- } else { +- for dz in -1..=1 { +- for dx in -1..=1 { +- self.dirty_light.insert(((x >> 4) + dx, (z >> 4) + dz)); +- } ++ } ++ if self.chunks.get(&(x >> 4, z >> 4)).is_some_and(|c| c.lit) { ++ self.light_edits.push(((x, y, z), previous, state)); ++ } else { ++ for dz in -1..=1 { ++ for dx in -1..=1 { ++ self.dirty_light.insert(((x >> 4) + dx, (z >> 4) + dz)); + } + } + } +- Ok(()) + } ++ /// A mod's view of the world at an earlier tick (`render.set-world-time-view`): moves it ++ /// toward `target` by at most `budget` changes, leaving alone the blocks around `protect` ++ /// (a block position whose neighbourhood stays as it is: the player's). Only the client's copy of the blocks changes. True when it has got there. ++ pub fn view_log( ++ &mut self, ++ target: Option, ++ budget: usize, ++ protect: Option<[i32; 3]>, ++ ) -> bool { ++ let Some(mut log) = self.log.take() else { ++ return true; ++ }; ++ let keep = |p: [i32; 3]| { ++ protect.is_none_or(|c| { ++ !((p[0] - c[0]).abs() <= 2 ++ && (p[2] - c[2]).abs() <= 2 ++ && (-3..=3).contains(&(p[1] - c[1]))) ++ }) ++ }; ++ let done = log.view(&mut ShownBlocks(self), target, budget, keep); ++ self.log = Some(log); ++ done ++ } ++} ++/// The world as a log's view writes it: only what is drawn changes. ++struct ShownBlocks<'a>(&'a mut World); ++impl crate::world_log::Blocks for ShownBlocks<'_> { ++ fn get(&self, pos: [i32; 3]) -> Option { ++ let w = &*self.0; ++ (w.chunks.get(&(pos[0] >> 4, pos[2] >> 4)).is_some() ++ && (MIN_Y..MIN_Y + (SECTIONS as i32) * 16).contains(&pos[1])) ++ .then(|| w.block(pos[0], pos[1], pos[2]).0) ++ } ++ fn put(&mut self, [x, y, z]: [i32; 3], state: u32) -> bool { ++ let w = &mut *self.0; ++ if !(MIN_Y..MIN_Y + (SECTIONS as i32) * 16).contains(&y) { ++ return false; ++ } ++ let Some(chunk) = w.chunks.get_mut(&(x >> 4, z >> 4)) else { ++ return false; ++ }; ++ let previous = Arc::make_mut(chunk).set(x & 15, y, z & 15, state); ++ if previous != state { ++ w.revision = w.revision.wrapping_add(1); ++ if w.mod_changes.watching { ++ w.mod_changes.note(x, y, z); ++ } ++ w.touched(x, y, z, previous, state); ++ } ++ true ++ } ++} ++impl World { + /// `getHeight(Heightmap.Types.WORLD_SURFACE, x, z)`: one above the highest + /// block that isn't `air`, or `MIN_Y` (also where the chunk isn't loaded). + pub fn world_surface(&self, x: i32, z: i32, air: impl Fn(BlockStateId) -> bool) -> i32 { +diff --git a/crates/horizon-client/src/world_log.rs b/crates/horizon-client/src/world_log.rs +new file mode 100644 +index 000000000..d0c0b1158 +--- /dev/null ++++ b/crates/horizon-client/src/world_log.rs +@@ -0,0 +1,372 @@ ++//! AirDef fork: a bounded log of the block changes the client's world took, and a view of the ++//! world as it stood at an earlier game tick (`render.world-log-start`, `set-world-time-view`). ++//! ++//! The view is a cursor into the log: the world shown is the real one with every change from ++//! the cursor on undone. Moving the cursor back undoes changes (newest first), moving it on ++//! redoes them, a few at a time so a long seek is spread over frames. A change that arrives ++//! while the cursor is behind the end is logged and kept as the block's real state, but not ++//! written (it lies after the view's time): it shows when the cursor passes it, or when the ++//! view ends and every displaced block is put back. Pure over [`Blocks`]; the world is one. ++use std::collections::{HashMap, VecDeque}; ++ ++pub type Pos = [i32; 3]; ++ ++/// Changes a log keeps (about 24 MB): the oldest go first. ++pub const CAP: usize = 1_000_000; ++ ++#[derive(Clone, Copy, Debug, PartialEq, Eq)] ++pub struct Entry { ++ pub tick: u64, ++ pub pos: Pos, ++ pub old: u32, ++ pub new: u32, ++} ++ ++/// The blocks a log shows its view in. ++pub trait Blocks { ++ /// The state at `pos`; None where the chunk is not loaded. ++ fn get(&self, pos: Pos) -> Option; ++ /// Writes a state as a display only (no gameplay, no network); false where it is not loaded. ++ fn put(&mut self, pos: Pos, state: u32) -> bool; ++} ++ ++pub struct WorldLog { ++ pub id: u32, ++ entries: VecDeque, ++ /// The sequence number of `entries[0]`. ++ base: u64, ++ /// Entries from this sequence number on are undone in the world shown. ++ cursor: u64, ++ /// Blocks shown other than they are: their real state. ++ shown: HashMap, ++ cap: usize, ++ /// The tick the log began, and the tick of the newest change it let go. ++ start: u64, ++ lost: Option, ++} ++ ++impl WorldLog { ++ pub fn new(id: u32, tick: u64) -> Self { ++ Self::with_cap(id, tick, CAP) ++ } ++ pub fn with_cap(id: u32, tick: u64, cap: usize) -> Self { ++ Self { ++ id, ++ entries: VecDeque::new(), ++ base: 0, ++ cursor: 0, ++ shown: HashMap::new(), ++ cap: cap.max(1), ++ start: tick, ++ lost: None, ++ } ++ } ++ fn end(&self) -> u64 { ++ self.base + self.entries.len() as u64 ++ } ++ pub fn len(&self) -> usize { ++ self.entries.len() ++ } ++ pub fn is_empty(&self) -> bool { ++ self.entries.is_empty() ++ } ++ /// The earliest tick whose world the log can show. ++ pub fn earliest(&self) -> u64 { ++ self.lost.unwrap_or(self.start) ++ } ++ /// Whether the world shown differs from the real one (a view is on, or blocks wait to be put back). ++ pub fn active(&self) -> bool { ++ self.cursor < self.end() || !self.shown.is_empty() ++ } ++ /// The blocks shown other than they are. ++ pub fn displaced(&self) -> usize { ++ self.shown.len() ++ } ++ /// The first sequence number whose change came after tick `t` (the world at `t` is the real ++ /// one with those undone). ++ fn seq_after(&self, t: u64) -> u64 { ++ let t = t.max(self.earliest()); ++ self.base + self.entries.partition_point(|e| e.tick <= t) as u64 ++ } ++ ++ /// A write of `new` to `pos` is about to happen with `stored` in the world: Some(the real ++ /// state before it) when it must not be written (the view is behind it, or the block is ++ /// displaced), None for an ordinary write (the caller's previous state is the real one). ++ pub fn deferred(&self, pos: Pos, stored: u32) -> Option { ++ (self.cursor < self.end() || self.shown.contains_key(&pos)) ++ .then(|| self.shown.get(&pos).copied().unwrap_or(stored)) ++ } ++ ++ /// Logs a change that happened at `tick` (`deferred`: it was not written, see [`deferred`]). ++ pub fn record(&mut self, tick: u64, pos: Pos, old: u32, new: u32, deferred: bool) { ++ if old == new { ++ return; ++ } ++ // Behind the end the new change is undone too: the cursor stays where it is. ++ let at_end = self.cursor == self.end(); ++ self.entries.push_back(Entry { ++ tick, ++ pos, ++ old, ++ new, ++ }); ++ if at_end && !deferred { ++ self.cursor = self.end(); ++ } ++ if deferred { ++ self.shown.insert(pos, new); ++ if at_end { ++ // Displaced blocks wait for their restoration with the cursor at the end. ++ self.cursor = self.end(); ++ } ++ } ++ while self.entries.len() > self.cap { ++ let gone = self.entries.pop_front().expect("over the cap"); ++ self.base += 1; ++ self.lost = Some(gone.tick); ++ } ++ self.cursor = self.cursor.max(self.base); ++ } ++ ++ /// Moves the view toward the world at `target` (None: the real world), at most `budget` ++ /// changes, leaving alone the blocks `keep` refuses. True when it has got there. ++ pub fn view( ++ &mut self, ++ blocks: &mut impl Blocks, ++ target: Option, ++ budget: usize, ++ keep: impl Fn(Pos) -> bool, ++ ) -> bool { ++ self.cursor = self.cursor.max(self.base); ++ let goal = target.map_or(self.end(), |t| self.seq_after(t)); ++ let mut left = budget; ++ while left > 0 && self.cursor > goal { ++ self.cursor -= 1; ++ let e = self.entries[(self.cursor - self.base) as usize]; ++ self.show(blocks, e.pos, e.old, &keep); ++ left -= 1; ++ } ++ while left > 0 && self.cursor < goal { ++ let e = self.entries[(self.cursor - self.base) as usize]; ++ self.cursor += 1; ++ self.show(blocks, e.pos, e.new, &keep); ++ left -= 1; ++ } ++ if self.cursor == goal && goal == self.end() && !self.shown.is_empty() { ++ // Back at the real world: whatever is still displaced goes back. ++ let rest: Vec<(Pos, u32)> = self ++ .shown ++ .iter() ++ .map(|(p, s)| (*p, *s)) ++ .take(left) ++ .collect(); ++ for (pos, real) in rest { ++ blocks.put(pos, real); ++ self.shown.remove(&pos); ++ } ++ } ++ self.cursor == goal && (goal != self.end() || self.shown.is_empty()) ++ } ++ ++ fn show( ++ &mut self, ++ blocks: &mut impl Blocks, ++ pos: Pos, ++ state: u32, ++ keep: &impl Fn(Pos) -> bool, ++ ) { ++ if !keep(pos) { ++ return; ++ } ++ let real = match self.shown.get(&pos) { ++ Some(&r) => r, ++ // Not loaded: skipped, silently. ++ None => match blocks.get(pos) { ++ Some(s) => s, ++ None => return, ++ }, ++ }; ++ if !blocks.put(pos, state) { ++ self.shown.remove(&pos); ++ } else if state == real { ++ self.shown.remove(&pos); ++ } else { ++ self.shown.insert(pos, real); ++ } ++ } ++} ++ ++#[cfg(test)] ++mod tests { ++ use super::*; ++ ++ /// A world of blocks, some chunks (x >> 4) not loaded. ++ #[derive(Default)] ++ struct W { ++ b: HashMap, ++ unloaded: Vec, ++ } ++ impl W { ++ fn loaded(&self, p: Pos) -> bool { ++ !self.unloaded.contains(&(p[0] >> 4)) ++ } ++ /// A real write, as the world's `set` does it. ++ fn set(&mut self, log: &mut WorldLog, tick: u64, p: Pos, s: u32) { ++ let stored = self.b.get(&p).copied().unwrap_or(0); ++ let deferred = log.deferred(p, stored); ++ let prev = deferred.unwrap_or(stored); ++ if deferred.is_none() { ++ self.b.insert(p, s); ++ } ++ log.record(tick, p, prev, s, deferred.is_some()); ++ } ++ fn shows(&self, p: Pos) -> u32 { ++ self.b.get(&p).copied().unwrap_or(0) ++ } ++ } ++ impl Blocks for W { ++ fn get(&self, p: Pos) -> Option { ++ self.loaded(p).then(|| self.shows(p)) ++ } ++ fn put(&mut self, p: Pos, s: u32) -> bool { ++ self.loaded(p).then(|| self.b.insert(p, s)).is_some() ++ } ++ } ++ ++ fn all(_: Pos) -> bool { ++ true ++ } ++ ++ /// Stone at 1 until a blast at tick 10 digs (0,0,0) and (1,0,0), tick 20 digs (2,0,0), tick 30 places 7 at (0,0,0). ++ fn raid() -> (W, WorldLog) { ++ let mut w = W::default(); ++ let mut log = WorldLog::new(1, 0); ++ for x in 0..3 { ++ w.b.insert([x, 0, 0], 1); ++ } ++ w.set(&mut log, 10, [0, 0, 0], 0); ++ w.set(&mut log, 10, [1, 0, 0], 0); ++ w.set(&mut log, 20, [2, 0, 0], 0); ++ w.set(&mut log, 30, [0, 0, 0], 7); ++ (w, log) ++ } ++ ++ #[test] ++ fn undo_and_redo_show_the_world_at_each_tick() { ++ let (mut w, mut log) = raid(); ++ let at = |w: &W| (w.shows([0, 0, 0]), w.shows([1, 0, 0]), w.shows([2, 0, 0])); ++ assert_eq!(at(&w), (7, 0, 0)); ++ assert!(log.view(&mut w, Some(5), 100, all)); ++ assert_eq!(at(&w), (1, 1, 1)); ++ assert!(log.view(&mut w, Some(10), 100, all)); ++ assert_eq!(at(&w), (0, 0, 1)); ++ assert!(log.view(&mut w, Some(25), 100, all)); ++ assert_eq!(at(&w), (0, 0, 0)); ++ // Back in time and on again, whichever way. ++ assert!(log.view(&mut w, Some(12), 100, all)); ++ assert_eq!(at(&w), (0, 0, 1)); ++ assert!(log.view(&mut w, Some(30), 100, all)); ++ assert_eq!(at(&w), (7, 0, 0)); ++ assert!(!log.active()); ++ } ++ ++ #[test] ++ fn ending_the_view_puts_every_block_back() { ++ let (mut w, mut log) = raid(); ++ log.view(&mut w, Some(0), 100, all); ++ assert!(log.active()); ++ assert_eq!(log.displaced(), 3); ++ assert!(log.view(&mut w, None, 100, all)); ++ assert_eq!( ++ (w.shows([0, 0, 0]), w.shows([1, 0, 0]), w.shows([2, 0, 0])), ++ (7, 0, 0) ++ ); ++ assert!(!log.active()); ++ } ++ ++ #[test] ++ fn a_seek_is_spread_over_budgeted_steps() { ++ let (mut w, mut log) = raid(); ++ let mut steps = 0; ++ while !log.view(&mut w, Some(0), 1, all) { ++ steps += 1; ++ assert!(steps < 10); ++ } ++ assert_eq!(steps, 3); ++ assert_eq!(w.shows([0, 0, 0]), 1); ++ } ++ ++ #[test] ++ fn a_change_that_arrives_during_the_view_waits_for_the_end() { ++ let (mut w, mut log) = raid(); ++ log.view(&mut w, Some(5), 100, all); ++ // A new block at an untouched place and a new state of a displaced one, at tick 40. ++ w.set(&mut log, 40, [5, 0, 0], 9); ++ w.set(&mut log, 40, [0, 0, 0], 8); ++ assert_eq!( ++ w.shows([5, 0, 0]), ++ 0, ++ "not shown while the view is at tick 5" ++ ); ++ assert_eq!(w.shows([0, 0, 0]), 1); ++ // The view moves past it: the real state shows. ++ log.view(&mut w, Some(40), 100, all); ++ assert_eq!(w.shows([5, 0, 0]), 9); ++ assert_eq!(w.shows([0, 0, 0]), 8); ++ // Seeking back hides it again, the end brings it back. ++ log.view(&mut w, Some(5), 100, all); ++ assert_eq!(w.shows([5, 0, 0]), 0); ++ log.view(&mut w, None, 100, all); ++ assert_eq!((w.shows([5, 0, 0]), w.shows([0, 0, 0])), (9, 8)); ++ assert!(!log.active()); ++ } ++ ++ #[test] ++ fn the_cap_drops_the_oldest_and_the_view_starts_from_the_earliest_known() { ++ let mut w = W::default(); ++ let mut log = WorldLog::with_cap(1, 0, 2); ++ for (i, x) in (0..4).enumerate() { ++ w.set(&mut log, 10 * (i as u64 + 1), [x, 0, 0], 1); ++ } ++ assert_eq!(log.len(), 2); ++ assert_eq!(log.earliest(), 20); ++ // Before the earliest shows the earliest: changes at ticks 30 and 40 undone only. ++ assert!(log.view(&mut w, Some(0), 100, all)); ++ assert_eq!( ++ ( ++ w.shows([0, 0, 0]), ++ w.shows([1, 0, 0]), ++ w.shows([2, 0, 0]), ++ w.shows([3, 0, 0]) ++ ), ++ (1, 1, 0, 0) ++ ); ++ assert!(log.view(&mut w, None, 100, all)); ++ assert_eq!(w.shows([3, 0, 0]), 1); ++ } ++ ++ #[test] ++ fn unloaded_chunks_are_skipped_silently() { ++ let mut w = W::default(); ++ let mut log = WorldLog::new(1, 0); ++ w.set(&mut log, 5, [0, 0, 0], 1); ++ w.set(&mut log, 5, [32, 0, 0], 1); ++ w.unloaded.push(2); ++ assert!(log.view(&mut w, Some(0), 100, all)); ++ assert_eq!(w.shows([0, 0, 0]), 0); ++ assert_eq!(log.displaced(), 1); ++ assert!(log.view(&mut w, None, 100, all)); ++ assert_eq!(w.shows([0, 0, 0]), 1); ++ assert!(!log.active()); ++ } ++ ++ #[test] ++ fn blocks_the_game_keeps_are_left_alone() { ++ let (mut w, mut log) = raid(); ++ let keep = |p: Pos| p[0] != 0; ++ log.view(&mut w, Some(0), 100, keep); ++ assert_eq!((w.shows([0, 0, 0]), w.shows([1, 0, 0])), (7, 1)); ++ log.view(&mut w, None, 100, all); ++ assert_eq!(w.shows([0, 0, 0]), 7); ++ } ++} +diff --git a/crates/horizon-mod-sdk/wit/horizon.wit b/crates/horizon-mod-sdk/wit/horizon.wit +index a0cc60c72..a367a666f 100644 +--- a/crates/horizon-mod-sdk/wit/horizon.wit ++++ b/crates/horizon-mod-sdk/wit/horizon.wit +@@ -858,6 +858,32 @@ interface render { + /// Meant for replays and films; false restores the player's settings. A + /// capture turns it on for its duration. + set-film-quality: func(on: bool); ++ /// Starts a log of the world's block changes as the game's client sees ++ /// them (AirDef fork, level 18): each change keeps its position, the ++ /// state before and after, and the game tick (the number `tick` is ++ /// called with). It is bounded (about a million changes): the oldest go ++ /// first. Returns the log's id, which stays the same while it runs (a ++ /// second call returns it). Only the world open now has it: a new world ++ /// (leaving, rejoining) loses it. Not kept when the world runs in the ++ /// game's own frame (`--in-frame`), where `world-log-range` stays none. ++ world-log-start: func() -> u32; ++ /// Ends the log and forgets what it kept (a different id is ignored). ++ world-log-stop: func(id: u32); ++ /// What the log covers, as (the earliest tick whose world it can show, ++ /// the tick it is at now); none for an unknown id, a log of another ++ /// world, or one that has not been taken up yet (the tick after ++ /// `world-log-start`). Asking for a time before the earliest shows the ++ /// earliest. ++ world-log-range: func(id: u32) -> option>; ++ /// Shows the world as it stood at a game tick, (log id, tick), to the ++ /// player's eyes only (AirDef fork, level 18): the changes logged after ++ /// it are undone in the game's own copy of the blocks, a little each ++ /// frame, and redone as the tick moves on; none (or the mod stopping, ++ /// the world changing) puts every block back. The server, the saves, ++ /// the player's own collision and the blocks next to the player are ++ /// untouched, and changes that arrive meanwhile are kept and shown ++ /// when the view ends. Chunks that are not loaded are skipped. ++ set-world-time-view: func(view: option>); + } + + /// What the game calls. Only the hooks `init` asks for are ever called. +diff --git a/crates/horizon-mods/src/api_level.rs b/crates/horizon-mods/src/api_level.rs +index ce4555e32..55920c1da 100644 +--- a/crates/horizon-mods/src/api_level.rs ++++ b/crates/horizon-mods/src/api_level.rs +@@ -7,13 +7,13 @@ + //! version's level so the launcher can tell before it installs. + + /// The newest level this Horizon serves. +-pub const LEVEL: u32 = 17; ++pub const LEVEL: u32 = 18; + + /// Every function the game offers mods, as `interface.function`, with its + /// level. Level 0 is the contract of Horizon 0.2.67 to 0.2.69. A new + /// function takes the next level and raises [`LEVEL`] (the `api_reference` + /// test fails until it is listed here). +-pub const FUNCTIONS: [(&str, u32); 74] = [ ++pub const FUNCTIONS: [(&str, u32); 78] = [ + ("log.write", 0), + ("game.get-player", 0), + ("game.get-clock", 0), +@@ -95,6 +95,11 @@ pub const FUNCTIONS: [(&str, u32); 74] = [ + ("render.capture-stop", 17), + ("render.capture-status", 17), + ("render.set-film-quality", 17), ++ // AirDef fork: a log of block changes and a view of the world as it was. ++ ("render.world-log-start", 18), ++ ("render.world-log-stop", 18), ++ ("render.world-log-range", 18), ++ ("render.set-world-time-view", 18), + ]; + + /// What the game's program carries so the launcher can read its level +diff --git a/crates/horizon-mods/src/runtime.rs b/crates/horizon-mods/src/runtime.rs +index b77e32c43..89fa150d0 100644 +--- a/crates/horizon-mods/src/runtime.rs ++++ b/crates/horizon-mods/src/runtime.rs +@@ -317,8 +317,17 @@ pub struct ModelTable { + capture_state: Option, + /// `render.set-film-quality`. + film_quality: bool, ++ /// `render.world-log-start`: the id of the log a mod asked for, if one runs. ++ world_log: Option, ++ /// What the game says the log covers: (id, earliest tick, tick now). ++ world_log_state: Option<(u32, u64, u64)>, ++ /// `render.set-world-time-view`: (log id, tick). ++ time_view: Option<(u32, u64)>, + } + ++/// The ids of block-change logs: never reused in a run of the game. ++static WORLD_LOG_IDS: std::sync::atomic::AtomicU32 = std::sync::atomic::AtomicU32::new(1); ++ + type ModelSlot = Arc>; + + /// A model as a mod set it: by name, or by a handle of the [`ModelTable`]. +@@ -1383,6 +1392,20 @@ impl Mods { + t.capture_state = Some(state); + } + } ++ /// The block-change log a mod asked for (`render.world-log-start`), if any. ++ pub fn world_log_wanted(&self) -> Option { ++ self.model_table.lock().ok()?.world_log ++ } ++ /// The game's note of what the log covers: (id, earliest tick, tick now), or none. ++ pub fn set_world_log_state(&self, state: Option<(u32, u64, u64)>) { ++ if let Ok(mut t) = self.model_table.lock() { ++ t.world_log_state = state; ++ } ++ } ++ /// The world a mod asked to be shown at a tick (`render.set-world-time-view`): (log id, tick). ++ pub fn time_view(&self) -> Option<(u32, u64)> { ++ self.model_table.lock().ok()?.time_view ++ } + /// Whether a mod asked for the best picture (`render.set-film-quality`). + pub fn film_quality(&self) -> bool { + self.model_table.lock().is_ok_and(|t| t.film_quality) +@@ -2458,6 +2481,33 @@ impl render::Host for State { + message: String::new(), + }) + } ++ fn world_log_start(&mut self) -> u32 { ++ let Ok(mut t) = self.model_table.lock() else { ++ return 0; ++ }; ++ *t.world_log.get_or_insert_with(|| { ++ WORLD_LOG_IDS.fetch_add(1, std::sync::atomic::Ordering::Relaxed) ++ }) ++ } ++ fn world_log_stop(&mut self, id: u32) { ++ if let Ok(mut t) = self.model_table.lock() ++ && t.world_log == Some(id) ++ { ++ t.world_log = None; ++ t.time_view = None; ++ } ++ } ++ fn world_log_range(&mut self, id: u32) -> Option<(u64, u64)> { ++ let t = self.model_table.lock().ok()?; ++ t.world_log_state ++ .filter(|s| s.0 == id && t.world_log == Some(id)) ++ .map(|s| (s.1, s.2)) ++ } ++ fn set_world_time_view(&mut self, view: Option<(u32, u64)>) { ++ if let Ok(mut t) = self.model_table.lock() { ++ t.time_view = view.filter(|v| t.world_log == Some(v.0)); ++ } ++ } + fn set_film_quality(&mut self, on: bool) { + if let Ok(mut t) = self.model_table.lock() { + t.film_quality = on; +diff --git a/docs/api/mods-reference.md b/docs/api/mods-reference.md +index d33e26705..c1dc88f54 100644 +--- a/docs/api/mods-reference.md ++++ b/docs/api/mods-reference.md +@@ -736,6 +736,10 @@ Where a capture is. + | `capture-stop` | `func(cancel: bool)` | Ends the capture: finishes the file, or (`cancel`) throws it away. | + | `capture-status` | `func() -> capture-state` | The capture's state; `done` and `failed` stay until the next start. | + | `set-film-quality` | `func(on: bool)` | Asks for the best picture the renderer can give (AirDef fork, level 17): the HD world at the full size of the window (no resolution scale, so no upscaling), and the volumetric clouds and fog marched with more steps. Meant for replays and films; false restores the player's settings. A capture turns it on for its duration. | ++| `world-log-start` | `func() -> u32` | Starts a log of the world's block changes as the game's client sees them (AirDef fork, level 18): each change keeps its position, the state before and after, and the game tick (the number `tick` is called with). It is bounded (about a million changes): the oldest go first. Returns the log's id, which stays the same while it runs (a second call returns it). Only the world open now has it: a new world (leaving, rejoining) loses it. Not kept when the world runs in the game's own frame (`--in-frame`), where `world-log-range` stays none. | ++| `world-log-stop` | `func(id: u32)` | Ends the log and forgets what it kept (a different id is ignored). | ++| `world-log-range` | `func(id: u32) -> option>` | What the log covers, as (the earliest tick whose world it can show, the tick it is at now); none for an unknown id, a log of another world, or one that has not been taken up yet (the tick after `world-log-start`). Asking for a time before the earliest shows the earliest. | ++| `set-world-time-view` | `func(view: option>)` | Shows the world as it stood at a game tick, (log id, tick), to the player's eyes only (AirDef fork, level 18): the changes logged after it are undone in the game's own copy of the blocks, a little each frame, and redone as the tick moves on; none (or the mod stopping, the world changing) puts every block back. The server, the saves, the player's own collision and the blocks next to the player are untouched, and changes that arrive meanwhile are kept and shown when the view ends. Chunks that are not loaded are skipped. | + + ## `events` + +-- +2.54.0 (Apple Git-157) + diff --git a/tools/gen_models.py b/tools/gen_models.py index 12f453a..b12be5f 100644 --- a/tools/gen_models.py +++ b/tools/gen_models.py @@ -9,11 +9,16 @@ """ import json import os +import sys import random import shutil +import zlib from PIL import Image +import gen_tex as GT + +sys.path.insert(0, os.path.dirname(os.path.abspath(__file__))) ROOT = os.path.normpath(os.path.join(os.path.dirname(__file__), "..", "airdef-mod")) NS = "airdef" @@ -231,6 +236,51 @@ TEXTURES = { } +RINGED = set() + + +def _ring(name, base, bands, seed, text=None): + RINGED.add(name) + TEXTURES[name] = lambda: GT.band_tex(base, bands, seed, text=text) + TEXTURES[name + "_t"] = lambda: GT.band_tex(base, bands, seed, transpose=True, text=text) + + +STRETCH_FN = {} +for _i, _k in enumerate(("nato_green", "flecktarn", "ru_green", "ru_khaki", "nato_tan")): + STRETCH_FN[_k] = (lambda sx, sy, k=_k, i=_i: GT.camo(k, 100 + i, 64, sx, sy)) + TEXTURES[_k] = (lambda k=_k, i=_i: GT.camo(k, 100 + i, 64)) +STRETCH_FN["track_side"] = lambda sx, sy: GT.track_side(7, 32, sx, sy) +TEXTURES.update({ + "track_side": lambda: GT.track_side(7), + "track": lambda: GT.track_tex(8), + "tire": lambda: GT.tire_tex(9), + "hub": lambda: GT.hub_tex(10), + "glass_cab": lambda: GT.glass_tex(11), + "bare_lamp": lambda: GT.glass_tex(12, tint=(200, 205, 190), refl=False), + "bare_barrel": lambda: GT.metal_tex((44, 46, 44), 13), + "bare_nozzle": lambda: GT.metal_tex((66, 58, 52), 14), + "bare_dish": lambda: GT.metal_tex((178, 180, 176), 15), + "bare_antenna": lambda: GT.metal_tex((112, 114, 112), 16), + "glow_ember": lambda: GT.Canvas(16, 1, 1, (255, 170, 80), 17).out(), + "metal": lambda: GT.painted((118, 120, 122), 18), + "dark_metal": lambda: GT.painted((52, 54, 52), 19), + "canister": lambda: GT.painted((92, 102, 74), 20), + "shahed": lambda: GT.painted((92, 96, 98), 21, panel=(20, 10)), + "geran": lambda: GT.painted((28, 28, 31), 22, panel=(20, 10)), + "kh101": lambda: GT.painted((84, 88, 92), 23, panel=(18, 10)), + "lancet": lambda: GT.painted((74, 82, 70), 24), + "missile_grey": lambda: GT.painted((150, 154, 156), 25), + "radar_face": lambda: GT.lattice(26), + "radar_big": lambda: GT.lattice(27, 32, (86, 94, 70), (170, 176, 150)), +}) +_ring("rm_pac3", (228, 228, 222), [(0.12, 2, (30, 30, 30)), (0.78, 1.5, (200, 170, 40)), (0.9, 1, (30, 30, 30))], 30, [(8, 14, 10)]) +_ring("rm_white", (232, 232, 226), [(0.1, 2, (200, 40, 36)), (0.82, 1.5, (40, 40, 44))], 31, [(10, 12, 8)]) +_ring("rm_ru", (226, 228, 222), [(0.15, 2, (170, 40, 36)), (0.55, 1, (40, 40, 40)), (0.85, 2, (170, 40, 36))], 32, [(9, 20, 10)]) +_ring("rm_grey", (148, 152, 154), [(0.2, 1.5, (210, 210, 205)), (0.8, 1.5, (210, 210, 205))], 33, [(6, 14, 12)]) +_ring("rm_khaki", (110, 112, 84), [(0.25, 2, (60, 62, 48)), (0.7, 1.5, (200, 190, 150))], 34, [(8, 18, 8)]) +_ring("rm_dark", (58, 60, 62), [(0.3, 1.5, (150, 150, 146)), (0.85, 1.5, (150, 150, 146))], 35) + + # ---------------------------------------------------------------- модели def el(frm, to, tex, faces=None, rot=None): """Элемент; rot = (ось, угол) — поворот вокруг центра элемента.""" @@ -257,28 +307,70 @@ def face_uv(frm, to, face): return [0, 0, max(0.25, min(16, w)), max(0.25, min(16, h))] -def model(parts): +VARIANTS = {} +TEXMAP = {"barrel": "bare_barrel", "nozzle": "bare_nozzle", "dish": "bare_dish", "antenna": "bare_antenna", + "glass": "glass_cab", "intake": "bare_nozzle"} +STRETCH = {"nato_green", "flecktarn", "ru_green", "ru_khaki", "nato_tan", "track_side"} + + +def _q(v): + return 1 if v < 1.5 else 2 if v < 2.5 else 3 + + +def vname(tex, qx, qy, burnt): + tex = TEXMAP.get(tex, tex) + if burnt and tex.startswith("glow_"): + tex = "bare_nozzle" + n = tex + if tex in STRETCH and (qx > 1 or qy > 1): + n += f"_s{qx}{qy}" + if burnt: + n += "_b" + if n != tex: + VARIANTS[n] = (tex, qx, qy, burnt) + return n + + +def model(parts, burnt=False): for p in parts: for i in range(3): assert -16 <= p["from"][i] <= 32 and -16 <= p["to"][i] <= 32, p textures, elements = {}, [] for p in parts: - textures[p["tex"]] = f"{NS}:block/{p['tex']}" faces = {} for f in ("north", "south", "east", "west", "up", "down"): tex = (p["faces"] or {}).get(f, p["tex"]) + uv = face_uv(p["from"], p["to"], f) + dx, dy, dz = (abs(p["to"][i] - p["from"][i]) for i in range(3)) + w, h = {"north": (dx, dy), "south": (dx, dy), "east": (dz, dy), "west": (dz, dy), + "up": (dx, dz), "down": (dx, dz)}[f] + tex = vname(tex, _q(w / 16), _q(h / 16), burnt) textures[tex] = f"{NS}:block/{tex}" - faces[f] = {"uv": face_uv(p["from"], p["to"], f), "texture": "#" + tex} + faces[f] = {"uv": uv, "texture": "#" + tex} e = {"from": p["from"], "to": p["to"], "faces": faces} if p.get("rot"): axis, angle = p["rot"] origin = [(p["from"][i] + p["to"][i]) / 2 for i in range(3)] e["rotation"] = {"angle": angle, "axis": axis, "origin": origin} elements.append(e) - textures["particle"] = f"{NS}:block/{parts[0]['tex']}" + textures["particle"] = next(iter(textures.values())) return {"ambientocclusion": False, "textures": textures, "elements": elements} +def burnt_parts(parts, seed): + """Остов: часть мелких деталей оторвана, антенны сорваны; текстуры — обгоревшие варианты (см. model(burnt=True)).""" + rnd = random.Random(seed) + out = [] + for i, p in enumerate(parts): + vol = 1.0 + for k in range(3): + vol *= abs(p["to"][k] - p["from"][k]) + if i > 2 and ((vol < 40 and rnd.random() < 0.3) or p["tex"] in ("antenna", "dish")): + continue + out.append(p) + return out + + def taper(tex, z0, z1, w0, w1, h0, h1, steps, y=8.0): """Корпус-веретено лесенкой: ширина w0→w1 и высота h0→h1 вдоль z0→z1.""" out = [] @@ -391,7 +483,7 @@ def patriot_truck(): el((-2, 24, -12), (18, 25, -4), "dark_metal"), el((2, 9, 20), (14, 13, 30), "metal")] for z in (-12, 14, 23): - p += both(el((-9, 0, z), (-5.5, 9, z + 8), "tire")) + p += wheel(-9, -5.5, z + 4) return p @@ -400,7 +492,7 @@ def patriot_trailer(): el((-1, 11, 14), (17, 16, 30), "metal"), el((-8, 3, -16), (24, 7, -12), "dark_metal")] for z in (14, 23): - p += both(el((-10, 0, z), (-6.5, 9, z + 8), "tire")) + p += wheel(-10, -6.5, z + 4) p += both(el((-9, 0, -6), (-7, 6, -4), "metal")) # опоры return p @@ -412,7 +504,7 @@ def patriot_radar(): el((-5, 12, -7), (21, 30, -6), "radar_face"), el((-2, 10, 10), (18, 18, 24), "metal")] for z in (14,): - p += both(el((-9, 0, z), (-5.5, 9, z + 8), "tire")) + p += wheel(-9, -5.5, z + 4) return p @@ -769,6 +861,144 @@ def flare(): return [el((6.5, 6.5, 6.5), (9.5, 9.5, 9.5), "lamp"), el((7.6, 9.5, 7.6), (8.4, 16, 8.4), "antenna")] +# ---------------------------------------------------------------- обновлённая геометрия +def B(x0, y0, z0, x1, y1, z1, tex, faces=None, rot=None): + """Элемент с x относительно центра модели.""" + return el((8 + x0, y0, z0), (8 + x1, y1, z1), tex, faces, rot) + + +def wheel(x0, x1, zc, r=4.6, tex="tire", hub="hub"): + """Колесо-восьмиугольник (квадрат + квадрат под 45 градусов) с диском на боковой грани, обе стороны. + x0..x1 — абсолютные координаты левого колеса; ось колеса лежит на y = r.""" + s = r * 1.8478 + faces = {"east": hub, "west": hub} + a = el((x0, r - s / 2, zc - s / 2), (x1, r + s / 2, zc + s / 2), tex, faces) + b = el((x0 + 0.03, r - s / 2, zc - s / 2), (x1 - 0.03, r + s / 2, zc + s / 2), tex, faces, rot=("x", 45)) + return both(a) + both(b) + + +def wheels(zs, x0=-9, x1=-5.5, tex="tire"): + out = [] + for z in zs: + out += wheel(x0, x1, z + 3.5, 4.5, tex) + return out + + +def tracked(tex): + """Гусеничное шасси (Бук, Тор): корпус, скошенный лоб, гусеницы с катками, решётки МТО, люки.""" + p = [el((-10, 4, -14), (26, 15, 32), tex), + el((-10, 4, -16), (26, 10, -14), tex), + el((-9, 10, -15), (25, 14, -12), tex, rot=("x", -22.5)), # лобовой лист + el((-8, 15, 22), (24, 16, 32), "dark_metal"), + el((-5, 15.2, 24), (21, 15.8, 31), "bare_nozzle"), # решётка МТО + el((-1, 15, -10), (9, 16, -4), "dark_metal")] + p += both(el((-14, 0, -15), (-10, 9, 31), "track", {"west": "track_side", "east": "track_side"})) + p += both(el((-14.5, 5, -15), (-10, 10, 31), tex)) + p += both(el((-4, 11, -16), (-1, 13, -15), "bare_lamp")) + return p + + +def oct_z(z0, z1, r, tex, x=0.0, y=8.0): + """Восьмигранная «труба» вдоль z (квадрат + квадрат под 45 градусов): корпус ракеты.""" + s = r * 1.8478 + f = {"up": tex + "_t", "down": tex + "_t"} if tex in RINGED else None + return [B(x - s / 2, y - s / 2, z0, x + s / 2, y + s / 2, z1, tex, f), + B(x - s / 2, y - s / 2, z0 + 0.03, x + s / 2, y + s / 2, z1 - 0.03, tex, f, rot=("z", 45))] + + +def ogive(z_tip, z_base, rb, tex, steps=4): + out = [] + for i in range(steps): + a = z_tip + (z_base - z_tip) * i / steps + b = z_tip + (z_base - z_tip) * (i + 1) / steps + t = (i + 0.7) / steps + out += oct_z(a, b, max(0.45, rb * min(1.0, t ** 0.55)), tex) + return out + + +def fins4(z0, z1, r, span, tex, sweep=3.0, th=0.7, y=8.0): + """Четыре стреловидных оперения крестом: корневая и концевая части.""" + m, k = r * 0.9, span * 0.55 + p = both(B(m, y - th / 2, z0, m + k, y + th / 2, z1, tex)) + p += both(B(m + k, y - th / 2, z0 + sweep, m + span, y + th / 2, z1, tex)) + for sg in (1, -1): + lo, hi = (y + m, y + m + k) if sg > 0 else (y - m - k, y - m) + p.append(B(-th / 2, lo, z0, th / 2, hi, z1, tex)) + lo, hi = (y + m + k, y + m + span) if sg > 0 else (y - m - span, y - m - k) + p.append(B(-th / 2, lo, z0 + sweep, th / 2, hi, z1, tex)) + return p + + +def nozzle(z, r, y=8.0): + """Сопло с раскалённым срезом (glow_ember — светящийся материал).""" + return [B(-r * .8, y - r * .8, z, r * .8, y + r * .8, z + 1.6, "nozzle"), + B(-r * .55, y - r * .55, z + 1.6, r * .55, y + r * .55, z + 1.9, "glow_ember")] + + +def pac3(): + p = ogive(-16, -9, 1.7, "nose_dark", 3) + oct_z(-9, 24, 1.7, "rm_pac3") + p += oct_z(-8, -7, 2.2, "dark_metal") # кольцо двигателей ориентации + p += fins4(18, 24, 1.7, 5, "missile", 3.5) + nozzle(24, 1.7) + return p + + +def irist_missile(): + p = ogive(-16, -9, 1.7, "white", 3) + oct_z(-9, 22, 1.7, "rm_white") + p += fins4(-8, -5.5, 1.7, 3.6, "missile_grey", 1.0) + fins4(16, 22, 1.7, 5, "white", 3.5) + nozzle(22, 1.7) + return p + + +def amraam_missile(): + p = ogive(-16, -9, 1.7, "nose_dark", 3) + oct_z(-9, 24, 1.7, "rm_white") + p += fins4(2, 8, 1.7, 5.5, "white", 3.5) + fins4(19, 24, 1.7, 3.8, "white", 2.5) + nozzle(24, 1.7) + return p + + +def missile_57e6(): + p = ogive(-16, -9, 1.2, "missile_ru", 3) + oct_z(-9, 4, 1.2, "missile_ru") + oct_z(4, 25, 1.7, "rm_ru") + p += fins4(18, 25, 1.7, 5, "booster", 3.0) + nozzle(25, 1.7) + return p + + +def missile_48n6(): + p = ogive(-16, -9, 1.9, "missile_ru", 3) + oct_z(-9, 26, 1.9, "rm_ru") + p += fins4(18, 26, 1.9, 6.2, "missile_ru", 4.0) + fins4(-6, -3, 1.9, 2.5, "missile_ru", 1.0) + nozzle(26, 1.9) + return p + + +def missile_77n6(): + p = ogive(-16, -8, 2.2, "missile_grey", 4) + oct_z(-8, 28, 2.2, "rm_grey") + p += oct_z(4, 6, 2.4, "booster") + fins4(22, 28, 2.2, 5.2, "missile_grey", 3.0) + nozzle(28, 2.2) + return p + + +def kalibr(): + p = ogive(-16, -9, 2.2, "missile_grey", 4) + oct_z(-9, 28, 2.2, "rm_grey") + p += [B(-14, 7.6, 6, 14, 8.4, 11, "missile_grey"), B(-0.8, 3.2, 17, 0.8, 5.4, 26, "dark_metal")] + p += fins4(23, 28, 2.2, 4.5, "missile_grey", 2.5) + nozzle(28, 2.0) + return p + + +def iskander(): + p = ogive(-16, -5, 3.6, "rm_khaki", 6) + oct_z(-5, 28, 3.6, "rm_khaki") + p += oct_z(3, 4, 3.8, "dark_metal") + fins4(23, 28, 3.6, 6.5, "ru_khaki", 2.0, 0.9) + nozzle(28, 3.4) + return p + + +def kinzhal(): + p = ogive(-16, -6, 3.4, "rm_dark", 5) + oct_z(-6, 28, 3.4, "rm_dark") + p += fins4(20, 28, 3.4, 8.0, "dark_metal", 4.0, 0.9) + nozzle(28, 3.0) + return p + + +def zircon(): + p = ogive(-16, -6, 2.6, "rm_dark", 4) + oct_z(-6, 28, 2.6, "rm_dark") + p += [B(-1.8, 3.4, 0, 1.8, 5.2, 24, "intake")] + p += fins4(22, 28, 2.6, 5.5, "dark_metal", 3.0) + nozzle(28, 2.4) + return p + + + MODELS = { "shahed": (shahed, "Шахед-136"), "shahed_prop": (shahed_prop, "Винт"), @@ -836,6 +1066,12 @@ MODELS = { el((7.5, 7.5, 12), (8.5, 8.5, 32), "flame")], "Боевой блок"), } +WRECKS = ["patriot_trailer", "patriot_launcher", "gepard_hull", "gepard_turret", "gepard_guns", "pantsir_truck", + "pantsir_turret", "pantsir_pack", "s400_chassis", "s400_tubes", "s500_chassis", "s500_tubes", + "irist_chassis", "irist_tubes", "nasams_trailer", "nasams_launcher", "buk_chassis", "buk_turret", + "buk_rails", "tor_chassis", "tor_turret", "p1sun_launcher", "radar_truck", "depot", "tzm_truck", + "ew_truck", "searchlight", "searchlight_head"] + CAM_MODELS = ["shahed", "geran3", "lancet", "gerbera", "kh101", "kalibr", "kh22", "zircon", "iskander", "kinzhal", "reentry"] # Предметы: (id, название, цвет иконки) @@ -903,15 +1139,23 @@ def main(): d = os.path.join(ROOT, "data", NS, "horizon") os.makedirs(os.path.join(a, "textures", "block")) os.makedirs(os.path.join(a, "textures", "item")) - for name, fn in TEXTURES.items(): - fn().save(os.path.join(a, "textures", "block", name + ".png")) lang = {} + for wid in WRECKS: + fn, title = MODELS[wid] + MODELS[wid + "_burnt"] = ((lambda fn=fn, wid=wid: burnt_parts(fn(), zlib.crc32(wid.encode()))), title + " (остов)") for name, (fn, title) in MODELS.items(): - write_json(os.path.join(a, "models", "block", name + ".json"), model(fn())) + write_json(os.path.join(a, "models", "block", name + ".json"), model(fn(), name.endswith("_burnt"))) write_json(os.path.join(a, "blockstates", name + ".json"), {"variants": {"": {"model": f"{NS}:block/{name}"}}}) write_json(os.path.join(d, "block", name + ".json"), {"template": "minecraft:stone", "item": False}) lang[f"block.{NS}.{name}"] = title + for name, fn in TEXTURES.items(): + fn().save(os.path.join(a, "textures", "block", name + ".png")) + for name, (base, qx, qy, burnt) in VARIANTS.items(): + im = STRETCH_FN[base](qx, qy) if (base in STRETCH_FN and (qx > 1 or qy > 1)) else TEXTURES[base]() + if burnt: + im = GT.burn(im, zlib.crc32(name.encode()), "glass" if base.startswith("glass") else "paint") + im.save(os.path.join(a, "textures", "block", name + ".png")) for i, (name, title, color) in enumerate(ITEMS): item_icon(color, i).save(os.path.join(a, "textures", "item", name + ".png")) write_json(os.path.join(a, "models", "item", name + ".json"), diff --git a/tools/gen_tex.py b/tools/gen_tex.py new file mode 100644 index 0000000..7dd2f16 --- /dev/null +++ b/tools/gen_tex.py @@ -0,0 +1,331 @@ +"""Общая палитра и генератор текстур мода AirDef (используется tools/gen_models.py). + +Все текстуры детерминированы (seed). Имя текстуры задаёт материал в HD (см. docs/HD-RENDERER.md, «Материалы»): + bare_* — голый металл / стекло (оверлей 42: гладко, полностью металлично): стволы, сопла, антенны, стёкла `bare_glass*`; + glow_* — светящиеся детали (оверлей 40): жар сопла, лампы; + прочее — крашеный металл (оверлей 41). +Имя `T__b` — обгоревший вариант текстуры T (остовы), `T@x3y1` — вариант для грани, растянутой в 3 раза по u +(в моделях грань длиннее 16 единиц тянет всю текстуру), картина заранее сжата, чтобы пятна камуфляжа не вытягивались. +""" +import random + +from PIL import Image + +# ------------------------------------------------------------------ палитра +PAL = { + "nato_green": [(70, 80, 54), (86, 74, 50), (34, 38, 30)], # NATO: зелёный, коричневый, чёрный + "flecktarn": [(88, 98, 62), (60, 74, 44), (112, 88, 56), (30, 32, 26)], + "ru_green": [(78, 94, 58), (52, 68, 40), (112, 94, 62), (32, 34, 26)], + "ru_khaki": [(112, 112, 82), (88, 92, 62), (64, 66, 46)], + "nato_tan": [(152, 132, 98), (126, 108, 78), (98, 86, 64)], + "olive": (74, 82, 58), + "rubber": (24, 24, 25), + "steel": (120, 122, 126), + "dark": (50, 52, 52), + "white": (236, 236, 230), + "grey": (150, 154, 158), + "red": (180, 40, 36), +} + + +def clamp(v): + return max(0, min(255, int(v))) + + +def col(c, d=0): + return tuple(clamp(v + d) for v in c[:3]) + + +def mix(a, b, t): + return tuple(clamp(a[i] + (b[i] - a[i]) * t) for i in range(3)) + + +class Canvas: + """Полотно в «физических» пикселях: S*sx × S*sy, на выходе — S×S со сжатием (антиалиасинг по BOX).""" + + def __init__(self, S, sx=1, sy=1, base=(0, 0, 0), seed=0): + self.S, self.sx, self.sy = S, sx, sy + self.W, self.H = S * sx, S * sy + self.im = Image.new("RGBA", (self.W, self.H), tuple(base) + (255,)) + self.px = self.im.load() + self.rnd = random.Random(seed) + + def put(self, x, y, c, a=1.0): + if 0 <= x < self.W and 0 <= y < self.H: + if a >= 1: + self.px[x, y] = tuple(c[:3]) + (255,) + else: + o = self.px[x, y] + self.px[x, y] = tuple(clamp(o[i] + (c[i] - o[i]) * a) for i in range(3)) + (255,) + + def noise(self, amp): + r = self.rnd + for y in range(self.H): + for x in range(self.W): + o = self.px[x, y] + d = r.randint(-amp, amp) + self.px[x, y] = (clamp(o[0] + d), clamp(o[1] + d), clamp(o[2] + d), 255) + + def rect(self, x0, y0, x1, y1, c, a=1.0): + for y in range(int(y0), int(y1)): + for x in range(int(x0), int(x1)): + self.put(x, y, c, a) + + def disc(self, cx, cy, r, c, a=1.0): + for y in range(int(cy - r - 1), int(cy + r + 2)): + for x in range(int(cx - r - 1), int(cx + r + 2)): + if (x + 0.5 - cx) ** 2 + (y + 0.5 - cy) ** 2 <= r * r: + self.put(x, y, c, a) + + def ellipse(self, cx, cy, rx, ry, c, wob=0.0): + r = self.rnd + for y in range(int(cy - ry - 2), int(cy + ry + 3)): + for x in range(int(cx - rx - 2), int(cx + rx + 3)): + if ((x - cx) / rx) ** 2 + ((y - cy) / ry) ** 2 <= 1 + r.random() * wob: + self.put(x, y, tuple(clamp(v + r.randint(-4, 4)) for v in c)) + + def panels(self, px_w, px_h, c_line, c_lite, rivets=True): + """Швы листов: сетка с неровными листами, блик под швом и заклёпки по краям.""" + r = self.rnd + y = r.randrange(px_h) + while y < self.H: + x = r.randrange(px_w) + for yy in range(int(y), int(y) + 1): + for xx in range(self.W): + self.put(xx, yy, c_line, 0.55) + self.put(xx, yy + 1, c_lite, 0.3) + y += px_h * (0.8 + r.random() * 0.5) + x = r.randrange(px_w) + while x < self.W: + for yy in range(self.H): + self.put(int(x), yy, c_line, 0.45) + self.put(int(x) + 1, yy, c_lite, 0.25) + x += px_w * (0.8 + r.random() * 0.5) + if rivets: + for _ in range(self.W * self.H // 160): + self.put(r.randrange(self.W), r.randrange(self.H), c_lite, 0.7) + + def dirt(self, amount, c=(30, 24, 18)): + """Подтёки сверху вниз и грязь снизу.""" + r = self.rnd + for _ in range(int(self.W * amount)): + x = r.randrange(self.W) + y0 = r.randrange(self.H) + for k in range(r.randint(3, max(4, self.H // 3))): + self.put(x, y0 + k, c, 0.16 * (1 - k / (self.H // 3 + 4))) + for y in range(self.H): + t = y / self.H + if t > 0.7: + for x in range(self.W): + self.put(x, y, c, (t - 0.7) * 0.5) + + def wear(self, amount, c): + r = self.rnd + for _ in range(int(self.W * self.H * amount)): + self.put(r.randrange(self.W), r.randrange(self.H), c, 0.6) + + def out(self): + im = self.im + if self.sx > 1 or self.sy > 1: + im = im.resize((self.S, self.S), Image.BOX) + return im + + +# ------------------------------------------------------------------ узоры +def painted(base, seed, S=32, sx=1, sy=1, panel=(14, 10), amp=3, dirt=0.1, wear=0.012, rivets=True): + """Крашеный лист: шум, швы, заклёпки, подтёки, сколы.""" + c = Canvas(S, sx, sy, base, seed) + c.noise(amp) + c.panels(panel[0] * 1, panel[1] * 1, col(base, -22), col(base, 16), rivets) + c.dirt(dirt) + c.wear(wear, col(base, 40)) + return c.out() + + +def camo(kind, seed, S=64, sx=1, sy=1): + cols = PAL[kind] + c = Canvas(S, sx, sy, cols[0], seed) + c.noise(3) + r = c.rnd + area = (c.W * c.H) / 1024.0 + if kind == "flecktarn": + for k in range(1, len(cols)): + for _ in range(int(area * 20)): + x, y = r.randrange(c.W), r.randrange(c.H) + c.ellipse(x, y, r.uniform(1.5, 4.5), r.uniform(1.2, 3.2), cols[k], 0.5) + else: + for k in range(1, len(cols)): + for _ in range(int(area * (5 if k == 1 else 3))): + x, y = r.randrange(c.W), r.randrange(c.H) + c.ellipse(x, y, r.uniform(4, 11), r.uniform(2.5, 6), cols[k], 0.35) + c.panels(22, 16, col(cols[0], -34), col(cols[0], 12), True) + c.dirt(0.12) + c.wear(0.006, col(cols[0], 46)) + return c.out() + + +def tire_tex(seed, S=32, sx=1, sy=1): + c = Canvas(S, sx, sy, PAL["rubber"], seed) + c.noise(3) + for x in range(0, c.W, 3): # протектор: ёлочка + for y in range(c.H): + if (y // 3) % 2 == 0: + c.put(x, y, (46, 46, 46), 0.9) + else: + c.put(x + 1, y, (46, 46, 46), 0.7) + for y in range(c.H): + c.put(0, y, (60, 60, 58), 0.8) + c.dirt(0.1, (60, 48, 36)) + return c.out() + + +def hub_tex(seed, S=32): + c = Canvas(S, 1, 1, (70, 72, 70), seed) + c.noise(3) + c.disc(S / 2, S / 2, S * 0.46, (34, 34, 34)) # боковина шины + c.disc(S / 2, S / 2, S * 0.30, (118, 120, 122)) # диск + c.disc(S / 2, S / 2, S * 0.2, (84, 86, 88)) + for k in range(8): + import math + a = k * math.pi / 4 + c.disc(S / 2 + math.cos(a) * S * 0.25, S / 2 + math.sin(a) * S * 0.25, 1, (36, 36, 38)) + c.disc(S / 2, S / 2, 2.4, (50, 52, 54)) + return c.out() + + +def track_tex(seed, S=32, sx=1, sy=1): + """Верх/низ гусеницы: траки поперёк.""" + c = Canvas(S, sx, sy, (36, 36, 34), seed) + c.noise(3) + for y in range(0, c.H, 3): + for x in range(c.W): + c.put(x, y, (78, 76, 70), 0.9) + c.put(x, y + 1, (20, 20, 20), 0.5) + c.dirt(0.1, (70, 58, 44)) + return c.out() + + +def track_side(seed, S=32, sx=1, sy=1): + """Борт гусеничного блока: ленивец, 7 опорных катков, ведущее колесо и траки сверху и снизу.""" + c = Canvas(S, sx, sy, (34, 34, 32), seed) + c.noise(3) + cy = 9 + for i in range(8): + x = 10 + i * (c.W - 20) / 7 + c.disc(x, cy, 6.2, (22, 22, 22)) + c.disc(x, cy, 4.6, (68, 70, 66)) + c.disc(x, cy, 1.8, (36, 38, 36)) + for x in range(0, c.W, 2): + c.put(x, 0, (86, 84, 76)) + c.put(x, 1, (26, 26, 24)) + c.put(x, 17, (86, 84, 76)) + c.dirt(0.15, (74, 60, 46)) + return c.out() + + +def glass_tex(seed, S=32, tint=(36, 56, 74), refl=True): + c = Canvas(S, 1, 1, tint, seed) + c.noise(3) + for y in range(S): # небо отражается сверху вниз + for x in range(S): + t = 1 - y / S + c.put(x, y, (150, 180, 200), 0.28 * t * t) + if refl: + for i in range(S): + c.put(i, S - 1 - i, (190, 210, 224), 0.5) + c.put(min(S - 1, i + 3), S - 1 - i, (170, 196, 212), 0.3) + for i in range(S): # рама + for k in (0, S - 1): + c.put(i, k, (20, 22, 22)) + c.put(k, i, (20, 22, 22)) + return c.out() + + +def metal_tex(base, seed, S=32, brush=True, sx=1, sy=1): + """Голый металл: шлифовка полосами, лёгкие царапины.""" + c = Canvas(S, sx, sy, base, seed) + r = c.rnd + for y in range(c.H): + d = r.randint(-5, 5) + for x in range(c.W): + c.put(x, y, col(base, d + r.randint(-2, 2))) + for _ in range(c.W // 3): + y = r.randrange(c.H) + x0 = r.randrange(c.W) + for k in range(r.randint(3, 9)): + c.put(x0 + k, y, col(base, 32), 0.6) + return c.out() + + +def band_tex(base, bands, seed, S=32, transpose=False, text=None): + """Ракета: полосы по длине (bands: (центр 0..1, ширина px, цвет)), трафарет. Для верха/низа — транспонировано.""" + c = Canvas(S, 1, 1, base, seed) + c.noise(2) + for f, w, cc in bands: + x0 = int(f * S - w / 2) + for x in range(x0, x0 + int(w)): + for y in range(S): + c.put(x, y, cc) + c.panels(12, 99, col(base, -26), col(base, 12), True) + if text: + for (x0, y0, w) in text: # «надпись» — тёмные штрихи + for k in range(0, w, 2): + c.rect(x0 + k, y0, x0 + k + 1, y0 + 3, col(base, -90)) + c.wear(0.01, col(base, 30)) + im = c.out() + return im.transpose(Image.TRANSPOSE) if transpose else im + + +def lattice(seed, S=32, base=(70, 76, 56), dot=(150, 154, 130)): + """Антенное полотно / ФАР: решётка элементов.""" + c = Canvas(S, 1, 1, base, seed) + c.noise(2) + for y in range(1, S - 1, 2): + for x in range(1, S - 1, 2): + c.put(x, y, dot, 0.9) + c.put(x + 1, y, col(base, -26), 0.8) + for k in range(0, S, 8): + for i in range(S): + c.put(k, i, col(base, -30)) + c.put(i, k, col(base, -30)) + return c.out() + + +def ember(seed, S=32): + return Canvas(S, 1, 1, (40, 30, 24), seed).out() + + +def burn(im, seed, kind="paint"): + """Обгоревший вариант: уголь, копоть сверху, ржавые пятна, прогары.""" + S = im.size[0] + r = random.Random(seed) + out = Image.new("RGBA", im.size) + src, dst = im.load(), out.load() + for y in range(S): + for x in range(S): + p = src[x, y] + g = (p[0] * 0.3 + p[1] * 0.5 + p[2] * 0.2) + k = 0.45 if kind != "glass" else 0.15 + c = mix(p, (g * 0.55, g * 0.5, g * 0.46), 0.75) + c = tuple(clamp(c[i] * (0.3 + 0.35 * k) + 6) for i in range(3)) + # копоть: темнее сверху + c = tuple(clamp(v * (0.75 + 0.25 * y / S)) for v in c) + dst[x, y] = c + (255,) + for _ in range(S * S // 28): # ржавые и обожжённые пятна + x, y = r.randrange(S), r.randrange(S) + rad = r.uniform(1, 3) + tone = r.choice([(96, 52, 28), (70, 40, 26), (22, 20, 20), (110, 80, 52)]) + for yy in range(int(y - rad), int(y + rad + 1)): + for xx in range(int(x - rad), int(x + rad + 1)): + if (xx - x) ** 2 + (yy - y) ** 2 <= rad * rad and 0 <= xx < S and 0 <= yy < S: + o = dst[xx, yy] + dst[xx, yy] = tuple(clamp(o[i] + (tone[i] - o[i]) * 0.6) for i in range(3)) + (255,) + if kind == "glass": # трещины + for _ in range(4): + x, y = r.randrange(S), r.randrange(S) + for k in range(r.randint(6, 14)): + x += r.choice([-1, 0, 1]) + y += r.choice([0, 1]) + if 0 <= x < S and 0 <= y < S: + dst[x, y] = (150, 160, 166, 255) + return out