Distinct item icons: a silhouette per item and category instead of one remote (#99)

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

.gitea/workflows/desktop.yml

@@ -22,7 +22,39 @@ jobs:
     if: inputs.os == 'macos' || inputs.os == 'both'
     runs-on: macos-latest
     steps:
+      - name: Проверка релиза
+        env:
+          TOKEN: ${{ secrets.RELEASE_TOKEN || gitea.token }}
+          API: ${{ github.server_url }}/api/v1/repos/${{ github.repository }}
+          TAG: ${{ inputs.tag }}
+        run: |
+          set -e
+          if ! [[ "$TAG" =~ ^build-[0-9]+$ ]]; then echo "::error::тег '$TAG' не похож на build-N"; exit 1; fi
+          REL_JSON=$(mktemp)
+          CODE=$(curl -s -o "$REL_JSON" -w '%{http_code}' -H "Authorization: token $TOKEN" "$API/releases/tags/$TAG")
+          if [ "$CODE" != "200" ]; then echo "::error::релиза с тегом $TAG нет (HTTP $CODE): сначала дождись сборки build.yml на main"; exit 1; fi
+          python3 - "$TAG" "$REL_JSON" <<'PY'
+          import json, os, sys
+          tag, path = sys.argv[1], sys.argv[2]
+          r = json.load(open(path))
+          assets = [a.get('name') for a in (r.get('assets') or [])]
+          if r.get('tag_name') != tag or r.get('name') != tag or 'airdef.hmod' not in assets:
+              print('::error::релиз %s не создан build.yml (нужны имя = тег и вложение airdef.hmod): чужой релиз не трогаем' % tag)
+              sys.exit(1)
+          with open(os.environ['GITHUB_ENV'], 'a') as f:
+              f.write('RELEASE_ID=%s\nRELEASE_SHA=%s\n' % (r['id'], r.get('target_commitish', '')))
+          PY
       - uses: actions/checkout@v4
+        with:
+          ref: refs/tags/${{ inputs.tag }}
+      - name: Проверка коммита
+        env:
+          TAG: ${{ inputs.tag }}
+        run: |
+          set -e
+          HEAD_SHA=$(git rev-parse HEAD)
+          if [[ "$RELEASE_SHA" =~ ^[0-9a-f]{40}$ ]] && [ "$HEAD_SHA" != "$RELEASE_SHA" ]; then echo "::error::тег $TAG указывает на $HEAD_SHA, а релиз создан из $RELEASE_SHA"; exit 1; fi
+          echo "собираю $TAG = $HEAD_SHA"
       - name: Rust
         run: |
           command -v cargo || curl -sSf https://sh.rustup.rs | sh -s -- -y --profile minimal
@@ -47,11 +79,10 @@ jobs:
         env:
           TOKEN: ${{ secrets.RELEASE_TOKEN || gitea.token }}
           API: ${{ github.server_url }}/api/v1/repos/${{ github.repository }}
-          TAG: ${{ inputs.tag }}
         run: |
           set -e
-          ID=$(curl -sf -H "Authorization: token $TOKEN" "$API/releases/tags/$TAG" | python3 -c 'import json,sys;print(json.load(sys.stdin)["id"])')
-          curl -sf -X POST -H "Authorization: token $TOKEN" -F "attachment=@out/airdef-macos-arm64.tar.gz" "$API/releases/$ID/assets?name=airdef-macos-arm64.tar.gz" > /dev/null
+          # RELEASE_ID взят в шаге «Проверка релиза» (релиз build-N, созданный build.yml)
+          curl -sf -X POST -H "Authorization: token $TOKEN" -F "attachment=@out/airdef-macos-arm64.tar.gz" "$API/releases/$RELEASE_ID/assets?name=airdef-macos-arm64.tar.gz" > /dev/null
 
   game-windows:
     if: inputs.os == 'windows' || inputs.os == 'both'
@@ -60,7 +91,34 @@ jobs:
       run:
         shell: pwsh
     steps:
+      - name: Проверка релиза
+        env:
+          TOKEN: ${{ secrets.RELEASE_TOKEN || gitea.token }}
+          API: ${{ github.server_url }}/api/v1/repos/${{ github.repository }}
+          TAG: ${{ inputs.tag }}
+        run: |
+          $ErrorActionPreference = 'Stop'
+          if ($env:TAG -notmatch '^build-\d+$') { Write-Output "::error::тег '$env:TAG' не похож на build-N"; exit 1 }
+          $h = @{ Authorization = "token $env:TOKEN" }
+          try { $r = Invoke-RestMethod -Headers $h "$env:API/releases/tags/$env:TAG" }
+          catch { Write-Output "::error::релиза с тегом $env:TAG нет: сначала дождись сборки build.yml на main"; exit 1 }
+          $assets = @($r.assets | ForEach-Object { $_.name })
+          if ($r.tag_name -ne $env:TAG -or $r.name -ne $env:TAG -or ($assets -notcontains 'airdef.hmod')) {
+            Write-Output "::error::релиз $env:TAG не создан build.yml (нужны имя = тег и вложение airdef.hmod): чужой релиз не трогаем"; exit 1
+          }
+          "RELEASE_ID=$($r.id)" | Out-File -Append -Encoding utf8 $env:GITHUB_ENV
+          "RELEASE_SHA=$($r.target_commitish)" | Out-File -Append -Encoding utf8 $env:GITHUB_ENV
       - uses: actions/checkout@v4
+        with:
+          ref: refs/tags/${{ inputs.tag }}
+      - name: Проверка коммита
+        env:
+          TAG: ${{ inputs.tag }}
+        run: |
+          $ErrorActionPreference = 'Stop'
+          $head = git rev-parse HEAD
+          if ($env:RELEASE_SHA -match '^[0-9a-f]{40}$' -and $head -ne $env:RELEASE_SHA) { Write-Output "::error::тег $env:TAG указывает на $head, а релиз создан из $env:RELEASE_SHA"; exit 1 }
+          Write-Output "собираю $env:TAG = $head"
       - name: Rust
         run: |
           if (-not (Get-Command cargo -ErrorAction SilentlyContinue)) {
@@ -88,9 +146,7 @@ jobs:
         env:
           TOKEN: ${{ secrets.RELEASE_TOKEN || gitea.token }}
           API: ${{ github.server_url }}/api/v1/repos/${{ github.repository }}
-          TAG: ${{ inputs.tag }}
         run: |
-          $h = @{ Authorization = "token $env:TOKEN" }
-          $id = (Invoke-RestMethod -Headers $h "$env:API/releases/tags/$env:TAG").id
-          curl.exe -sf -X POST -H "Authorization: token $env:TOKEN" -F "attachment=@out\airdef-windows-x86_64.zip" "$env:API/releases/$id/assets?name=airdef-windows-x86_64.zip"
+          # RELEASE_ID взят в шаге «Проверка релиза» (релиз build-N, созданный build.yml)
+          curl.exe -sf -X POST -H "Authorization: token $env:TOKEN" -F "attachment=@out\airdef-windows-x86_64.zip" "$env:API/releases/$env:RELEASE_ID/assets?name=airdef-windows-x86_64.zip"
 

.gitea/workflows/game.yml

@@ -25,7 +25,39 @@ jobs:
           FREE=$(df --output=avail -BG / | tail -1 | tr -dc 0-9)
           echo "свободно: ${FREE} ГБ"
           if [ "$FREE" -lt 15 ]; then echo "::error::на сервере свободно ${FREE} ГБ, нужно хотя бы 15: сборка игры забьёт диск и уронит Gitea"; exit 1; fi
+      - name: Проверка релиза
+        env:
+          TOKEN: ${{ secrets.RELEASE_TOKEN || gitea.token }}
+          API: ${{ github.server_url }}/api/v1/repos/${{ github.repository }}
+          TAG: ${{ inputs.tag }}
+        run: |
+          set -e
+          if ! [[ "$TAG" =~ ^build-[0-9]+$ ]]; then echo "::error::тег '$TAG' не похож на build-N"; exit 1; fi
+          REL_JSON=$(mktemp)
+          CODE=$(curl -s -o "$REL_JSON" -w '%{http_code}' -H "Authorization: token $TOKEN" "$API/releases/tags/$TAG")
+          if [ "$CODE" != "200" ]; then echo "::error::релиза с тегом $TAG нет (HTTP $CODE): сначала дождись сборки build.yml на main"; exit 1; fi
+          python3 - "$TAG" "$REL_JSON" <<'PY'
+          import json, os, sys
+          tag, path = sys.argv[1], sys.argv[2]
+          r = json.load(open(path))
+          assets = [a.get('name') for a in (r.get('assets') or [])]
+          if r.get('tag_name') != tag or r.get('name') != tag or 'airdef.hmod' not in assets:
+              print('::error::релиз %s не создан build.yml (нужны имя = тег и вложение airdef.hmod): чужой релиз не трогаем' % tag)
+              sys.exit(1)
+          with open(os.environ['GITHUB_ENV'], 'a') as f:
+              f.write('RELEASE_ID=%s\nRELEASE_SHA=%s\n' % (r['id'], r.get('target_commitish', '')))
+          PY
       - uses: actions/checkout@v4
+        with:
+          ref: refs/tags/${{ inputs.tag }}
+      - name: Проверка коммита
+        env:
+          TAG: ${{ inputs.tag }}
+        run: |
+          set -e
+          HEAD_SHA=$(git rev-parse HEAD)
+          if [[ "$RELEASE_SHA" =~ ^[0-9a-f]{40}$ ]] && [ "$HEAD_SHA" != "$RELEASE_SHA" ]; then echo "::error::тег $TAG указывает на $HEAD_SHA, а релиз создан из $RELEASE_SHA"; exit 1; fi
+          echo "собираю $TAG = $HEAD_SHA"
       - name: Системные библиотеки
         run: |
           SUDO=$(command -v sudo || true)
@@ -45,12 +77,11 @@ jobs:
         env:
           TOKEN: ${{ secrets.RELEASE_TOKEN || gitea.token }}
           API: ${{ github.server_url }}/api/v1/repos/${{ github.repository }}
-          TAG: ${{ inputs.tag }}
         run: |
           set -e
           D=airdef-linux-x86_64
           mkdir -p "$D" out
           cp horizon/target/fast/horizon-client horizon/target/fast/horizon-ctl airdef-mod/target/horizon-mod/airdef.hmod dist/play.sh docs/INSTALL.md "$D/"
           tar czf "out/$D.tar.gz" "$D"
-          ID=$(curl -sf -H "Authorization: token $TOKEN" "$API/releases/tags/$TAG" | python3 -c 'import json,sys;print(json.load(sys.stdin)["id"])')
-          curl -sf -X POST -H "Authorization: token $TOKEN" -F "attachment=@out/$D.tar.gz" "$API/releases/$ID/assets?name=$D.tar.gz" > /dev/null
+          # RELEASE_ID взят в шаге «Проверка релиза» (релиз build-N, созданный build.yml)
+          curl -sf -X POST -H "Authorization: token $TOKEN" -F "attachment=@out/$D.tar.gz" "$API/releases/$RELEASE_ID/assets?name=$D.tar.gz" > /dev/null

.gitignore

@@ -5,3 +5,5 @@ airdef-mod/target/
 __pycache__/
 /out/
 .DS_Store
+run-home-bench/
+run-home-smoke/

README.md

@@ -27,7 +27,9 @@ python3 tools/airdef.py play    # запустить (аргументы игр
 CI: `.gitea/workflows/build.yml` на каждый пуш собирает только мод (`airdef.hmod`), а пуш в `main` публикует его
 релизом `build-N`. Игру-форк собирают вручную: `.gitea/workflows/game.yml` (Linux) и `.gitea/workflows/desktop.yml`
 (macOS и Windows, на раннерах с метками `macos-latest` / `windows-latest`); оба запускаются из Actions с тегом
-готового релиза и дописывают свои архивы в него.
+готового релиза `build-N`. Перед сборкой workflow проверяет, что такой релиз создан `build.yml` (имя релиза = тег,
+есть `airdef.hmod`), иначе падает с ошибкой; затем выкачивает ровно коммит этого тега (а не ветку, с которой запущен),
+сверяет его с коммитом релиза и дописывает архивы только в этот релиз.
 
 ## Как играть
 
@@ -149,6 +151,8 @@ API мода `render.set-lights` (до 512, плавно интерполиру
 Команды:
 - `/airdef wave <тип> [кол-во] [дальность]` — налёт на ближайшую цель. Типы: `shahed`, `geran3`, `lancet`, `gerbera`, `kh101`, `kalibr`, `kh22`, `zircon`, `iskander`, `kinzhal`, `oreshnik` и `mix` (комбинированный удар двумя секторами: «Герберы», шахеды, Герани-3, Х-101, «Калибры», Х-22, Циркон, «Искандер», «Кинжал», при 30+ — «Орешник»);
 - `/airdef replay [map|full|reel|stop]` — повтор последнего налёта;
+- `/airdef replay film [best|all|N]` — фильм режиссёра: для каждого перехвата/прилёта несколько планов (комплекс, пуск, погоня за ракетой, взгляд с цели, замедленный крупный план поражения, общий план после), склейки, плавные движения камеры, камера не уходит под землю; играется в максимальном качестве (HD, мир в полном разрешении, больше шагов облаков и тумана; настройки возвращаются после);
+- `/airdef replay export [имя] [best|all|N] [fps=60] [size=1920x1080] [crf=14] [sec=N] [noaudio]` — тот же фильм кадр за кадром с фиксированным шагом (скорость компьютера не важна) в MP4 с звуком: `<HORIZON_HOME>/airdef-films/<имя>.mp4` (нужен `ffmpeg` в PATH или `HORIZON_FFMPEG`; без него — PNG-последовательность и готовая команда ffmpeg). Прогресс в чате, отмена — `/airdef replay stop`. Окно игры держите в фокусе (пауза останавливает съёмку); чат попадает в кадр.
 - `/airdef import` — перенести в текущий мир комплексы и цели из старой версии мода (до 0.2.x они были общими для всех миров);
 - `/airdef raid` — налёт, настроенный в меню; `/airdef target here` — отметить объект под ногами; `/airdef repair` — ремонт;
 - `/airdef roles` — показать, по каким классам целей работает каждый комплекс; `/airdef roles <patriot|gepard|pantsir|s400|s500|all> <классы|default>` — задать (классы через запятую: `drone`, `jet`, `cruise`, `supersonic`, `ballistic` или `all`), например `/airdef roles s400 cruise,ballistic`;

airdef-mod/NOTES-terrain-guidance.md

@@ -0,0 +1,5 @@
+Status of terrain-aware flight (not committed):
+- Done: sim/terrain.rs (look-ahead terrain following, dive only down a clear line, interceptor steer/loft/self-destruct, launch predicate), planner relief pricing + spawn above land (raid.rs), SAM launch check + why line (mod.rs, why.rs), Tally.scrubbed, world.probe, harness terrain fixes, 6 new tests in regress.rs. Build has no warnings; cargo test passes (43 + 4).
+- Numbers (6 seeds, sim_run big-smart): hills:70:100:140 crashes 13 -> 3, hills:70:150:120 29 -> 2, default hills 2 -> 2 (all terminal-dive near-target by Kh101/Kalibr).
+- Half-done / known: terminal dive of slow-turning cruise missiles still sometimes hits ground 7-20 blocks short of target; hills:70:150:120 tick max 38 ms / p95 2 ms (planner terrain phase + ground queries) not profiled; not tested in game.
+- Next: tune dive geometry for Kh101/Kalibr, profile the planner's 1024-columns-per-tick height requests, optional in-game check.

airdef-mod/assets/airdef/blockstates/buk_chassis_burnt.json

@@ -0,0 +1,7 @@
+{
+ "variants": {
+  "": {
+   "model": "airdef:block/buk_chassis_burnt"
+  }
+ }
+}

airdef-mod/assets/airdef/blockstates/buk_rails_burnt.json

@@ -0,0 +1,7 @@
+{
+ "variants": {
+  "": {
+   "model": "airdef:block/buk_rails_burnt"
+  }
+ }
+}

airdef-mod/assets/airdef/blockstates/buk_turret_burnt.json

@@ -0,0 +1,7 @@
+{
+ "variants": {
+  "": {
+   "model": "airdef:block/buk_turret_burnt"
+  }
+ }
+}

airdef-mod/assets/airdef/blockstates/depot_burnt.json

@@ -0,0 +1,7 @@
+{
+ "variants": {
+  "": {
+   "model": "airdef:block/depot_burnt"
+  }
+ }
+}

airdef-mod/assets/airdef/blockstates/ew_truck_burnt.json

@@ -0,0 +1,7 @@
+{
+ "variants": {
+  "": {
+   "model": "airdef:block/ew_truck_burnt"
+  }
+ }
+}

airdef-mod/assets/airdef/blockstates/gepard_guns_burnt.json

@@ -0,0 +1,7 @@
+{
+ "variants": {
+  "": {
+   "model": "airdef:block/gepard_guns_burnt"
+  }
+ }
+}

airdef-mod/assets/airdef/blockstates/gepard_hull_burnt.json

@@ -0,0 +1,7 @@
+{
+ "variants": {
+  "": {
+   "model": "airdef:block/gepard_hull_burnt"
+  }
+ }
+}

airdef-mod/assets/airdef/blockstates/gepard_turret_burnt.json

@@ -0,0 +1,7 @@
+{
+ "variants": {
+  "": {
+   "model": "airdef:block/gepard_turret_burnt"
+  }
+ }
+}

airdef-mod/assets/airdef/blockstates/irist_chassis_burnt.json

@@ -0,0 +1,7 @@
+{
+ "variants": {
+  "": {
+   "model": "airdef:block/irist_chassis_burnt"
+  }
+ }
+}

airdef-mod/assets/airdef/blockstates/irist_tubes_burnt.json

@@ -0,0 +1,7 @@
+{
+ "variants": {
+  "": {
+   "model": "airdef:block/irist_tubes_burnt"
+  }
+ }
+}

airdef-mod/assets/airdef/blockstates/nasams_launcher_burnt.json

@@ -0,0 +1,7 @@
+{
+ "variants": {
+  "": {
+   "model": "airdef:block/nasams_launcher_burnt"
+  }
+ }
+}

airdef-mod/assets/airdef/blockstates/nasams_trailer_burnt.json

@@ -0,0 +1,7 @@
+{
+ "variants": {
+  "": {
+   "model": "airdef:block/nasams_trailer_burnt"
+  }
+ }
+}

airdef-mod/assets/airdef/blockstates/p1sun_launcher_burnt.json

@@ -0,0 +1,7 @@
+{
+ "variants": {
+  "": {
+   "model": "airdef:block/p1sun_launcher_burnt"
+  }
+ }
+}

airdef-mod/assets/airdef/blockstates/pantsir_pack_burnt.json

@@ -0,0 +1,7 @@
+{
+ "variants": {
+  "": {
+   "model": "airdef:block/pantsir_pack_burnt"
+  }
+ }
+}

airdef-mod/assets/airdef/blockstates/pantsir_truck_burnt.json

@@ -0,0 +1,7 @@
+{
+ "variants": {
+  "": {
+   "model": "airdef:block/pantsir_truck_burnt"
+  }
+ }
+}

airdef-mod/assets/airdef/blockstates/pantsir_turret_burnt.json

@@ -0,0 +1,7 @@
+{
+ "variants": {
+  "": {
+   "model": "airdef:block/pantsir_turret_burnt"
+  }
+ }
+}

airdef-mod/assets/airdef/blockstates/patriot_launcher_burnt.json

@@ -0,0 +1,7 @@
+{
+ "variants": {
+  "": {
+   "model": "airdef:block/patriot_launcher_burnt"
+  }
+ }
+}

airdef-mod/assets/airdef/blockstates/patriot_trailer_burnt.json

@@ -0,0 +1,7 @@
+{
+ "variants": {
+  "": {
+   "model": "airdef:block/patriot_trailer_burnt"
+  }
+ }
+}

airdef-mod/assets/airdef/blockstates/radar_truck_burnt.json

@@ -0,0 +1,7 @@
+{
+ "variants": {
+  "": {
+   "model": "airdef:block/radar_truck_burnt"
+  }
+ }
+}

airdef-mod/assets/airdef/blockstates/s400_chassis_burnt.json

@@ -0,0 +1,7 @@
+{
+ "variants": {
+  "": {
+   "model": "airdef:block/s400_chassis_burnt"
+  }
+ }
+}

airdef-mod/assets/airdef/blockstates/s400_tubes_burnt.json

@@ -0,0 +1,7 @@
+{
+ "variants": {
+  "": {
+   "model": "airdef:block/s400_tubes_burnt"
+  }
+ }
+}

airdef-mod/assets/airdef/blockstates/s500_chassis_burnt.json

@@ -0,0 +1,7 @@
+{
+ "variants": {
+  "": {
+   "model": "airdef:block/s500_chassis_burnt"
+  }
+ }
+}

airdef-mod/assets/airdef/blockstates/s500_tubes_burnt.json

@@ -0,0 +1,7 @@
+{
+ "variants": {
+  "": {
+   "model": "airdef:block/s500_tubes_burnt"
+  }
+ }
+}

airdef-mod/assets/airdef/blockstates/searchlight_burnt.json

@@ -0,0 +1,7 @@
+{
+ "variants": {
+  "": {
+   "model": "airdef:block/searchlight_burnt"
+  }
+ }
+}

airdef-mod/assets/airdef/blockstates/searchlight_head_burnt.json

@@ -0,0 +1,7 @@
+{
+ "variants": {
+  "": {
+   "model": "airdef:block/searchlight_head_burnt"
+  }
+ }
+}

airdef-mod/assets/airdef/blockstates/tor_chassis_burnt.json

@@ -0,0 +1,7 @@
+{
+ "variants": {
+  "": {
+   "model": "airdef:block/tor_chassis_burnt"
+  }
+ }
+}

airdef-mod/assets/airdef/blockstates/tor_turret_burnt.json

@@ -0,0 +1,7 @@
+{
+ "variants": {
+  "": {
+   "model": "airdef:block/tor_turret_burnt"
+  }
+ }
+}

airdef-mod/assets/airdef/blockstates/tzm_truck_burnt.json

@@ -0,0 +1,7 @@
+{
+ "variants": {
+  "": {
+   "model": "airdef:block/tzm_truck_burnt"
+  }
+ }
+}

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",

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",

airdef-mod/assets/airdef/models/block/buk_chassis.json

@@ -1,10 +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",
   "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",
+  "mk_ru2": "airdef:block/mk_ru2",
+  "particle": "airdef:block/ru_green_s21"
  },
  "elements": [
   {
@@ -26,7 +34,7 @@
       16,
       11.0
      ],
-     "texture": "#ru_green"
+     "texture": "#ru_green_s21"
     },
     "south": {
      "uv": [
@@ -35,7 +43,7 @@
       16,
       11.0
      ],
-     "texture": "#ru_green"
+     "texture": "#ru_green_s21"
     },
     "east": {
      "uv": [
@@ -44,7 +52,7 @@
       16,
       11.0
      ],
-     "texture": "#ru_green"
+     "texture": "#ru_green_s31"
     },
     "west": {
      "uv": [
@@ -53,7 +61,7 @@
       16,
       11.0
      ],
-     "texture": "#ru_green"
+     "texture": "#ru_green_s31"
     },
     "up": {
      "uv": [
@@ -62,7 +70,7 @@
       16,
       16
      ],
-     "texture": "#ru_green"
+     "texture": "#ru_green_s23"
     },
     "down": {
      "uv": [
@@ -71,7 +79,7 @@
       16,
       16
      ],
-     "texture": "#ru_green"
+     "texture": "#ru_green_s23"
     }
    }
   },
@@ -94,7 +102,7 @@
       16,
       6.0
      ],
-     "texture": "#ru_green"
+     "texture": "#ru_green_s21"
     },
     "south": {
      "uv": [
@@ -103,7 +111,7 @@
       16,
       6.0
      ],
-     "texture": "#ru_green"
+     "texture": "#ru_green_s21"
     },
     "east": {
      "uv": [
@@ -130,7 +138,7 @@
       16,
       2.0
      ],
-     "texture": "#ru_green"
+     "texture": "#ru_green_s21"
     },
     "down": {
      "uv": [
@@ -139,10 +147,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 +296,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 +469,7 @@
       16,
       9.0
      ],
-     "texture": "#track"
+     "texture": "#track_side_s31"
     },
     "west": {
      "uv": [
@@ -257,7 +478,7 @@
       16,
       9.0
      ],
-     "texture": "#track"
+     "texture": "#track_side_s31"
     },
     "up": {
      "uv": [
@@ -316,7 +537,7 @@
       16,
       9.0
      ],
-     "texture": "#track"
+     "texture": "#track_side_s31"
     },
     "west": {
      "uv": [
@@ -325,7 +546,7 @@
       16,
       9.0
      ],
-     "texture": "#track"
+     "texture": "#track_side_s31"
     },
     "up": {
      "uv": [
@@ -384,7 +605,7 @@
       16,
       5.0
      ],
-     "texture": "#ru_green"
+     "texture": "#ru_green_s31"
     },
     "west": {
      "uv": [
@@ -393,7 +614,7 @@
       16,
       5.0
      ],
-     "texture": "#ru_green"
+     "texture": "#ru_green_s31"
     },
     "up": {
      "uv": [
@@ -402,7 +623,7 @@
       4.5,
       16
      ],
-     "texture": "#ru_green"
+     "texture": "#ru_green_s13"
     },
     "down": {
      "uv": [
@@ -411,7 +632,7 @@
       4.5,
       16
      ],
-     "texture": "#ru_green"
+     "texture": "#ru_green_s13"
     }
    }
   },
@@ -452,7 +673,7 @@
       16,
       5.0
      ],
-     "texture": "#ru_green"
+     "texture": "#ru_green_s31"
     },
     "west": {
      "uv": [
@@ -461,7 +682,7 @@
       16,
       5.0
      ],
-     "texture": "#ru_green"
+     "texture": "#ru_green_s31"
     },
     "up": {
      "uv": [
@@ -470,7 +691,7 @@
       4.5,
       16
      ],
-     "texture": "#ru_green"
+     "texture": "#ru_green_s13"
     },
     "down": {
      "uv": [
@@ -479,7 +700,483 @@
       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"
+    }
+   }
+  },
+  {
+   "from": [
+    26.0,
+    11.0,
+    0.0
+   ],
+   "to": [
+    26.12,
+    14.5,
+    8.0
+   ],
+   "faces": {
+    "north": {
+     "uv": [
+      0,
+      0,
+      0.25,
+      3.5
+     ],
+     "texture": "#mk_ru2"
+    },
+    "south": {
+     "uv": [
+      0,
+      0,
+      0.25,
+      3.5
+     ],
+     "texture": "#mk_ru2"
+    },
+    "east": {
+     "uv": [
+      0,
+      0,
+      8.0,
+      3.5
+     ],
+     "texture": "#mk_ru2"
+    },
+    "west": {
+     "uv": [
+      0,
+      0,
+      8.0,
+      3.5
+     ],
+     "texture": "#mk_ru2"
+    },
+    "up": {
+     "uv": [
+      0,
+      0,
+      0.25,
+      8.0
+     ],
+     "texture": "#mk_ru2"
+    },
+    "down": {
+     "uv": [
+      0,
+      0,
+      0.25,
+      8.0
+     ],
+     "texture": "#mk_ru2"
+    }
+   }
+  },
+  {
+   "from": [
+    -10.120000000000001,
+    11.0,
+    0.0
+   ],
+   "to": [
+    -10.0,
+    14.5,
+    8.0
+   ],
+   "faces": {
+    "north": {
+     "uv": [
+      0,
+      0,
+      0.25,
+      3.5
+     ],
+     "texture": "#mk_ru2"
+    },
+    "south": {
+     "uv": [
+      0,
+      0,
+      0.25,
+      3.5
+     ],
+     "texture": "#mk_ru2"
+    },
+    "east": {
+     "uv": [
+      0,
+      0,
+      8.0,
+      3.5
+     ],
+     "texture": "#mk_ru2"
+    },
+    "west": {
+     "uv": [
+      0,
+      0,
+      8.0,
+      3.5
+     ],
+     "texture": "#mk_ru2"
+    },
+    "up": {
+     "uv": [
+      0,
+      0,
+      0.25,
+      8.0
+     ],
+     "texture": "#mk_ru2"
+    },
+    "down": {
+     "uv": [
+      0,
+      0,
+      0.25,
+      8.0
+     ],
+     "texture": "#mk_ru2"
+    }
+   }
+  },
+  {
+   "from": [
+    3.0,
+    16.0,
+    2.0
+   ],
+   "to": [
+    7.0,
+    17.4,
+    8.0
+   ],
+   "faces": {
+    "north": {
+     "uv": [
+      0,
+      0,
+      4.0,
+      1.3999999999999986
+     ],
+     "texture": "#dark_metal"
+    },
+    "south": {
+     "uv": [
+      0,
+      0,
+      4.0,
+      1.3999999999999986
+     ],
+     "texture": "#dark_metal"
+    },
+    "east": {
+     "uv": [
+      0,
+      0,
+      6.0,
+      1.3999999999999986
+     ],
+     "texture": "#dark_metal"
+    },
+    "west": {
+     "uv": [
+      0,
+      0,
+      6.0,
+      1.3999999999999986
+     ],
+     "texture": "#dark_metal"
+    },
+    "up": {
+     "uv": [
+      0,
+      0,
+      4.0,
+      6.0
+     ],
+     "texture": "#dark_metal"
+    },
+    "down": {
+     "uv": [
+      0,
+      0,
+      4.0,
+      6.0
+     ],
+     "texture": "#dark_metal"
+    }
+   }
+  },
+  {
+   "from": [
+    9.0,
+    16.0,
+    2.0
+   ],
+   "to": [
+    13.0,
+    17.4,
+    8.0
+   ],
+   "faces": {
+    "north": {
+     "uv": [
+      0,
+      0,
+      4.0,
+      1.3999999999999986
+     ],
+     "texture": "#dark_metal"
+    },
+    "south": {
+     "uv": [
+      0,
+      0,
+      4.0,
+      1.3999999999999986
+     ],
+     "texture": "#dark_metal"
+    },
+    "east": {
+     "uv": [
+      0,
+      0,
+      6.0,
+      1.3999999999999986
+     ],
+     "texture": "#dark_metal"
+    },
+    "west": {
+     "uv": [
+      0,
+      0,
+      6.0,
+      1.3999999999999986
+     ],
+     "texture": "#dark_metal"
+    },
+    "up": {
+     "uv": [
+      0,
+      0,
+      4.0,
+      6.0
+     ],
+     "texture": "#dark_metal"
+    },
+    "down": {
+     "uv": [
+      0,
+      0,
+      4.0,
+      6.0
+     ],
+     "texture": "#dark_metal"
+    }
+   }
+  },
+  {
+   "from": [
+    5.0,
+    16.0,
+    -8.0
+   ],
+   "to": [
+    11.0,
+    17.0,
+    -4.0
+   ],
+   "faces": {
+    "north": {
+     "uv": [
+      0,
+      0,
+      6.0,
+      1.0
+     ],
+     "texture": "#bare_lamp"
+    },
+    "south": {
+     "uv": [
+      0,
+      0,
+      6.0,
+      1.0
+     ],
+     "texture": "#bare_lamp"
+    },
+    "east": {
+     "uv": [
+      0,
+      0,
+      4.0,
+      1.0
+     ],
+     "texture": "#bare_lamp"
+    },
+    "west": {
+     "uv": [
+      0,
+      0,
+      4.0,
+      1.0
+     ],
+     "texture": "#bare_lamp"
+    },
+    "up": {
+     "uv": [
+      0,
+      0,
+      6.0,
+      4.0
+     ],
+     "texture": "#bare_lamp"
+    },
+    "down": {
+     "uv": [
+      0,
+      0,
+      6.0,
+      4.0
+     ],
+     "texture": "#bare_lamp"
     }
    }
   }

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"
     }
    }
   }

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"
+    }
+   }
+  }
+ ]
+}

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"
     }
    }
   },

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"
+    }
+   }
+  }
+ ]
+}

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": [

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"
+    }
+   }
+  }
+ ]
+}

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"
     }
    }
   }

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"
     }
    }
   },

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"
     }
    }
   },

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"
+    }
+   }
+  }
+ ]
+}

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"
     }
    }
   }

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"
+    }
+   }
+  }
+ ]
+}

airdef-mod/assets/airdef/models/block/gepard_turret.json

@@ -1,10 +1,14 @@
 {
  "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"
+  "mk_de": "airdef:block/mk_de",
+  "bare_antenna": "airdef:block/bare_antenna",
+  "dark_metal": "airdef:block/dark_metal",
+  "particle": "airdef:block/flecktarn_s21"
  },
  "elements": [
   {
@@ -26,7 +30,7 @@
       16,
       12.0
      ],
-     "texture": "#flecktarn"
+     "texture": "#flecktarn_s21"
     },
     "south": {
      "uv": [
@@ -35,7 +39,7 @@
       16,
       12.0
      ],
-     "texture": "#flecktarn"
+     "texture": "#flecktarn_s21"
     },
     "east": {
      "uv": [
@@ -62,7 +66,7 @@
       16,
       16
      ],
-     "texture": "#flecktarn"
+     "texture": "#flecktarn_s21"
     },
     "down": {
      "uv": [
@@ -71,7 +75,7 @@
       16,
       16
      ],
-     "texture": "#flecktarn"
+     "texture": "#flecktarn_s21"
     }
    }
   },
@@ -278,6 +282,550 @@
      "texture": "#metal"
     }
    }
+  },
+  {
+   "from": [
+    20.0,
+    3.0,
+    -5.5
+   ],
+   "to": [
+    20.119999999999997,
+    6.5,
+    1.5
+   ],
+   "faces": {
+    "north": {
+     "uv": [
+      0,
+      0,
+      0.25,
+      3.5
+     ],
+     "texture": "#mk_de"
+    },
+    "south": {
+     "uv": [
+      0,
+      0,
+      0.25,
+      3.5
+     ],
+     "texture": "#mk_de"
+    },
+    "east": {
+     "uv": [
+      0,
+      0,
+      7.0,
+      3.5
+     ],
+     "texture": "#mk_de"
+    },
+    "west": {
+     "uv": [
+      0,
+      0,
+      7.0,
+      3.5
+     ],
+     "texture": "#mk_de"
+    },
+    "up": {
+     "uv": [
+      0,
+      0,
+      0.25,
+      7.0
+     ],
+     "texture": "#mk_de"
+    },
+    "down": {
+     "uv": [
+      0,
+      0,
+      0.25,
+      7.0
+     ],
+     "texture": "#mk_de"
+    }
+   }
+  },
+  {
+   "from": [
+    -4.119999999999997,
+    3.0,
+    -5.5
+   ],
+   "to": [
+    -4.0,
+    6.5,
+    1.5
+   ],
+   "faces": {
+    "north": {
+     "uv": [
+      0,
+      0,
+      0.25,
+      3.5
+     ],
+     "texture": "#mk_de"
+    },
+    "south": {
+     "uv": [
+      0,
+      0,
+      0.25,
+      3.5
+     ],
+     "texture": "#mk_de"
+    },
+    "east": {
+     "uv": [
+      0,
+      0,
+      7.0,
+      3.5
+     ],
+     "texture": "#mk_de"
+    },
+    "west": {
+     "uv": [
+      0,
+      0,
+      7.0,
+      3.5
+     ],
+     "texture": "#mk_de"
+    },
+    "up": {
+     "uv": [
+      0,
+      0,
+      0.25,
+      7.0
+     ],
+     "texture": "#mk_de"
+    },
+    "down": {
+     "uv": [
+      0,
+      0,
+      0.25,
+      7.0
+     ],
+     "texture": "#mk_de"
+    }
+   }
+  },
+  {
+   "from": [
+    5.5,
+    14.0,
+    2.0
+   ],
+   "to": [
+    10.5,
+    14.8,
+    7.0
+   ],
+   "faces": {
+    "north": {
+     "uv": [
+      0,
+      0,
+      5.0,
+      0.8000000000000007
+     ],
+     "texture": "#metal"
+    },
+    "south": {
+     "uv": [
+      0,
+      0,
+      5.0,
+      0.8000000000000007
+     ],
+     "texture": "#metal"
+    },
+    "east": {
+     "uv": [
+      0,
+      0,
+      5.0,
+      0.8000000000000007
+     ],
+     "texture": "#metal"
+    },
+    "west": {
+     "uv": [
+      0,
+      0,
+      5.0,
+      0.8000000000000007
+     ],
+     "texture": "#metal"
+    },
+    "up": {
+     "uv": [
+      0,
+      0,
+      5.0,
+      5.0
+     ],
+     "texture": "#metal"
+    },
+    "down": {
+     "uv": [
+      0,
+      0,
+      5.0,
+      5.0
+     ],
+     "texture": "#metal"
+    }
+   }
+  },
+  {
+   "from": [
+    2.0,
+    14.0,
+    5.0
+   ],
+   "to": [
+    3.0,
+    16.0,
+    6.0
+   ],
+   "faces": {
+    "north": {
+     "uv": [
+      0,
+      0,
+      1.0,
+      2.0
+     ],
+     "texture": "#bare_antenna"
+    },
+    "south": {
+     "uv": [
+      0,
+      0,
+      1.0,
+      2.0
+     ],
+     "texture": "#bare_antenna"
+    },
+    "east": {
+     "uv": [
+      0,
+      0,
+      1.0,
+      2.0
+     ],
+     "texture": "#bare_antenna"
+    },
+    "west": {
+     "uv": [
+      0,
+      0,
+      1.0,
+      2.0
+     ],
+     "texture": "#bare_antenna"
+    },
+    "up": {
+     "uv": [
+      0,
+      0,
+      1.0,
+      1.0
+     ],
+     "texture": "#bare_antenna"
+    },
+    "down": {
+     "uv": [
+      0,
+      0,
+      1.0,
+      1.0
+     ],
+     "texture": "#bare_antenna"
+    }
+   }
+  },
+  {
+   "from": [
+    -4.800000000000001,
+    7.0,
+    -5.0
+   ],
+   "to": [
+    -4.0,
+    10.0,
+    -2.0
+   ],
+   "faces": {
+    "north": {
+     "uv": [
+      0,
+      0,
+      0.8000000000000007,
+      3.0
+     ],
+     "texture": "#dark_metal"
+    },
+    "south": {
+     "uv": [
+      0,
+      0,
+      0.8000000000000007,
+      3.0
+     ],
+     "texture": "#dark_metal"
+    },
+    "east": {
+     "uv": [
+      0,
+      0,
+      3.0,
+      3.0
+     ],
+     "texture": "#dark_metal"
+    },
+    "west": {
+     "uv": [
+      0,
+      0,
+      3.0,
+      3.0
+     ],
+     "texture": "#dark_metal"
+    },
+    "up": {
+     "uv": [
+      0,
+      0,
+      0.8000000000000007,
+      3.0
+     ],
+     "texture": "#dark_metal"
+    },
+    "down": {
+     "uv": [
+      0,
+      0,
+      0.8000000000000007,
+      3.0
+     ],
+     "texture": "#dark_metal"
+    }
+   }
+  },
+  {
+   "from": [
+    20.0,
+    7.0,
+    -5.0
+   ],
+   "to": [
+    20.8,
+    10.0,
+    -2.0
+   ],
+   "faces": {
+    "north": {
+     "uv": [
+      0,
+      0,
+      0.8000000000000007,
+      3.0
+     ],
+     "texture": "#dark_metal"
+    },
+    "south": {
+     "uv": [
+      0,
+      0,
+      0.8000000000000007,
+      3.0
+     ],
+     "texture": "#dark_metal"
+    },
+    "east": {
+     "uv": [
+      0,
+      0,
+      3.0,
+      3.0
+     ],
+     "texture": "#dark_metal"
+    },
+    "west": {
+     "uv": [
+      0,
+      0,
+      3.0,
+      3.0
+     ],
+     "texture": "#dark_metal"
+    },
+    "up": {
+     "uv": [
+      0,
+      0,
+      0.8000000000000007,
+      3.0
+     ],
+     "texture": "#dark_metal"
+    },
+    "down": {
+     "uv": [
+      0,
+      0,
+      0.8000000000000007,
+      3.0
+     ],
+     "texture": "#dark_metal"
+    }
+   }
+  },
+  {
+   "from": [
+    -4.800000000000001,
+    7.0,
+    -1.5
+   ],
+   "to": [
+    -4.0,
+    10.0,
+    0.5
+   ],
+   "faces": {
+    "north": {
+     "uv": [
+      0,
+      0,
+      0.8000000000000007,
+      3.0
+     ],
+     "texture": "#dark_metal"
+    },
+    "south": {
+     "uv": [
+      0,
+      0,
+      0.8000000000000007,
+      3.0
+     ],
+     "texture": "#dark_metal"
+    },
+    "east": {
+     "uv": [
+      0,
+      0,
+      2.0,
+      3.0
+     ],
+     "texture": "#dark_metal"
+    },
+    "west": {
+     "uv": [
+      0,
+      0,
+      2.0,
+      3.0
+     ],
+     "texture": "#dark_metal"
+    },
+    "up": {
+     "uv": [
+      0,
+      0,
+      0.8000000000000007,
+      2.0
+     ],
+     "texture": "#dark_metal"
+    },
+    "down": {
+     "uv": [
+      0,
+      0,
+      0.8000000000000007,
+      2.0
+     ],
+     "texture": "#dark_metal"
+    }
+   }
+  },
+  {
+   "from": [
+    20.0,
+    7.0,
+    -1.5
+   ],
+   "to": [
+    20.8,
+    10.0,
+    0.5
+   ],
+   "faces": {
+    "north": {
+     "uv": [
+      0,
+      0,
+      0.8000000000000007,
+      3.0
+     ],
+     "texture": "#dark_metal"
+    },
+    "south": {
+     "uv": [
+      0,
+      0,
+      0.8000000000000007,
+      3.0
+     ],
+     "texture": "#dark_metal"
+    },
+    "east": {
+     "uv": [
+      0,
+      0,
+      2.0,
+      3.0
+     ],
+     "texture": "#dark_metal"
+    },
+    "west": {
+     "uv": [
+      0,
+      0,
+      2.0,
+      3.0
+     ],
+     "texture": "#dark_metal"
+    },
+    "up": {
+     "uv": [
+      0,
+      0,
+      0.8000000000000007,
+      2.0
+     ],
+     "texture": "#dark_metal"
+    },
+    "down": {
+     "uv": [
+      0,
+      0,
+      0.8000000000000007,
+      2.0
+     ],
+     "texture": "#dark_metal"
+    }
+   }
   }
  ]
 }

airdef-mod/assets/airdef/models/block/gepard_turret_burnt.json

@@ -0,0 +1,695 @@
+{
+ "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",
+  "mk_de_b": "airdef:block/mk_de_b",
+  "bare_antenna_b": "airdef:block/bare_antenna_b",
+  "dark_metal_b": "airdef:block/dark_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"
+    }
+   }
+  },
+  {
+   "from": [
+    20.0,
+    3.0,
+    -5.5
+   ],
+   "to": [
+    20.119999999999997,
+    6.5,
+    1.5
+   ],
+   "faces": {
+    "north": {
+     "uv": [
+      0,
+      0,
+      0.25,
+      3.5
+     ],
+     "texture": "#mk_de_b"
+    },
+    "south": {
+     "uv": [
+      0,
+      0,
+      0.25,
+      3.5
+     ],
+     "texture": "#mk_de_b"
+    },
+    "east": {
+     "uv": [
+      0,
+      0,
+      7.0,
+      3.5
+     ],
+     "texture": "#mk_de_b"
+    },
+    "west": {
+     "uv": [
+      0,
+      0,
+      7.0,
+      3.5
+     ],
+     "texture": "#mk_de_b"
+    },
+    "up": {
+     "uv": [
+      0,
+      0,
+      0.25,
+      7.0
+     ],
+     "texture": "#mk_de_b"
+    },
+    "down": {
+     "uv": [
+      0,
+      0,
+      0.25,
+      7.0
+     ],
+     "texture": "#mk_de_b"
+    }
+   }
+  },
+  {
+   "from": [
+    -4.119999999999997,
+    3.0,
+    -5.5
+   ],
+   "to": [
+    -4.0,
+    6.5,
+    1.5
+   ],
+   "faces": {
+    "north": {
+     "uv": [
+      0,
+      0,
+      0.25,
+      3.5
+     ],
+     "texture": "#mk_de_b"
+    },
+    "south": {
+     "uv": [
+      0,
+      0,
+      0.25,
+      3.5
+     ],
+     "texture": "#mk_de_b"
+    },
+    "east": {
+     "uv": [
+      0,
+      0,
+      7.0,
+      3.5
+     ],
+     "texture": "#mk_de_b"
+    },
+    "west": {
+     "uv": [
+      0,
+      0,
+      7.0,
+      3.5
+     ],
+     "texture": "#mk_de_b"
+    },
+    "up": {
+     "uv": [
+      0,
+      0,
+      0.25,
+      7.0
+     ],
+     "texture": "#mk_de_b"
+    },
+    "down": {
+     "uv": [
+      0,
+      0,
+      0.25,
+      7.0
+     ],
+     "texture": "#mk_de_b"
+    }
+   }
+  },
+  {
+   "from": [
+    2.0,
+    14.0,
+    5.0
+   ],
+   "to": [
+    3.0,
+    16.0,
+    6.0
+   ],
+   "faces": {
+    "north": {
+     "uv": [
+      0,
+      0,
+      1.0,
+      2.0
+     ],
+     "texture": "#bare_antenna_b"
+    },
+    "south": {
+     "uv": [
+      0,
+      0,
+      1.0,
+      2.0
+     ],
+     "texture": "#bare_antenna_b"
+    },
+    "east": {
+     "uv": [
+      0,
+      0,
+      1.0,
+      2.0
+     ],
+     "texture": "#bare_antenna_b"
+    },
+    "west": {
+     "uv": [
+      0,
+      0,
+      1.0,
+      2.0
+     ],
+     "texture": "#bare_antenna_b"
+    },
+    "up": {
+     "uv": [
+      0,
+      0,
+      1.0,
+      1.0
+     ],
+     "texture": "#bare_antenna_b"
+    },
+    "down": {
+     "uv": [
+      0,
+      0,
+      1.0,
+      1.0
+     ],
+     "texture": "#bare_antenna_b"
+    }
+   }
+  },
+  {
+   "from": [
+    -4.800000000000001,
+    7.0,
+    -5.0
+   ],
+   "to": [
+    -4.0,
+    10.0,
+    -2.0
+   ],
+   "faces": {
+    "north": {
+     "uv": [
+      0,
+      0,
+      0.8000000000000007,
+      3.0
+     ],
+     "texture": "#dark_metal_b"
+    },
+    "south": {
+     "uv": [
+      0,
+      0,
+      0.8000000000000007,
+      3.0
+     ],
+     "texture": "#dark_metal_b"
+    },
+    "east": {
+     "uv": [
+      0,
+      0,
+      3.0,
+      3.0
+     ],
+     "texture": "#dark_metal_b"
+    },
+    "west": {
+     "uv": [
+      0,
+      0,
+      3.0,
+      3.0
+     ],
+     "texture": "#dark_metal_b"
+    },
+    "up": {
+     "uv": [
+      0,
+      0,
+      0.8000000000000007,
+      3.0
+     ],
+     "texture": "#dark_metal_b"
+    },
+    "down": {
+     "uv": [
+      0,
+      0,
+      0.8000000000000007,
+      3.0
+     ],
+     "texture": "#dark_metal_b"
+    }
+   }
+  },
+  {
+   "from": [
+    20.0,
+    7.0,
+    -5.0
+   ],
+   "to": [
+    20.8,
+    10.0,
+    -2.0
+   ],
+   "faces": {
+    "north": {
+     "uv": [
+      0,
+      0,
+      0.8000000000000007,
+      3.0
+     ],
+     "texture": "#dark_metal_b"
+    },
+    "south": {
+     "uv": [
+      0,
+      0,
+      0.8000000000000007,
+      3.0
+     ],
+     "texture": "#dark_metal_b"
+    },
+    "east": {
+     "uv": [
+      0,
+      0,
+      3.0,
+      3.0
+     ],
+     "texture": "#dark_metal_b"
+    },
+    "west": {
+     "uv": [
+      0,
+      0,
+      3.0,
+      3.0
+     ],
+     "texture": "#dark_metal_b"
+    },
+    "up": {
+     "uv": [
+      0,
+      0,
+      0.8000000000000007,
+      3.0
+     ],
+     "texture": "#dark_metal_b"
+    },
+    "down": {
+     "uv": [
+      0,
+      0,
+      0.8000000000000007,
+      3.0
+     ],
+     "texture": "#dark_metal_b"
+    }
+   }
+  },
+  {
+   "from": [
+    -4.800000000000001,
+    7.0,
+    -1.5
+   ],
+   "to": [
+    -4.0,
+    10.0,
+    0.5
+   ],
+   "faces": {
+    "north": {
+     "uv": [
+      0,
+      0,
+      0.8000000000000007,
+      3.0
+     ],
+     "texture": "#dark_metal_b"
+    },
+    "south": {
+     "uv": [
+      0,
+      0,
+      0.8000000000000007,
+      3.0
+     ],
+     "texture": "#dark_metal_b"
+    },
+    "east": {
+     "uv": [
+      0,
+      0,
+      2.0,
+      3.0
+     ],
+     "texture": "#dark_metal_b"
+    },
+    "west": {
+     "uv": [
+      0,
+      0,
+      2.0,
+      3.0
+     ],
+     "texture": "#dark_metal_b"
+    },
+    "up": {
+     "uv": [
+      0,
+      0,
+      0.8000000000000007,
+      2.0
+     ],
+     "texture": "#dark_metal_b"
+    },
+    "down": {
+     "uv": [
+      0,
+      0,
+      0.8000000000000007,
+      2.0
+     ],
+     "texture": "#dark_metal_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": [
   {

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"
+    }
+   }
+  }
+ ]
+}

airdef-mod/assets/airdef/models/block/lancet.json

@@ -2,20 +2,21 @@
  "ambientocclusion": false,
  "textures": {
   "lancet": "airdef:block/lancet",
-  "intake": "airdef:block/intake",
+  "bare_lamp": "airdef:block/bare_lamp",
   "dark_metal": "airdef:block/dark_metal",
+  "prop": "airdef:block/prop",
   "particle": "airdef:block/lancet"
  },
  "elements": [
   {
    "from": [
-    6.875,
-    6.875,
+    7.170068602879533,
+    7.170068602879533,
     -16.0
    ],
    "to": [
-    9.125,
-    9.125,
+    8.829931397120468,
+    8.829931397120468,
     -14.0
    ],
    "faces": {
@@ -23,8 +24,8 @@
      "uv": [
       0,
       0,
-      2.25,
-      2.25
+      1.6598627942409356,
+      1.6598627942409356
      ],
      "texture": "#lancet"
     },
@@ -32,8 +33,8 @@
      "uv": [
       0,
       0,
-      2.25,
-      2.25
+      1.6598627942409356,
+      1.6598627942409356
      ],
      "texture": "#lancet"
     },
@@ -42,7 +43,7 @@
       0,
       0,
       2.0,
-      2.25
+      1.6598627942409356
      ],
      "texture": "#lancet"
     },
@@ -51,7 +52,7 @@
       0,
       0,
       2.0,
-      2.25
+      1.6598627942409356
      ],
      "texture": "#lancet"
     },
@@ -59,7 +60,7 @@
      "uv": [
       0,
       0,
-      2.25,
+      1.6598627942409356,
       2.0
      ],
      "texture": "#lancet"
@@ -68,7 +69,7 @@
      "uv": [
       0,
       0,
-      2.25,
+      1.6598627942409356,
       2.0
      ],
      "texture": "#lancet"
@@ -77,13 +78,90 @@
   },
   {
    "from": [
-    6.625,
-    6.625,
+    7.170068602879533,
+    7.170068602879533,
+    -15.97
+   ],
+   "to": [
+    8.829931397120468,
+    8.829931397120468,
+    -14.03
+   ],
+   "faces": {
+    "north": {
+     "uv": [
+      0,
+      0,
+      1.6598627942409356,
+      1.6598627942409356
+     ],
+     "texture": "#lancet"
+    },
+    "south": {
+     "uv": [
+      0,
+      0,
+      1.6598627942409356,
+      1.6598627942409356
+     ],
+     "texture": "#lancet"
+    },
+    "east": {
+     "uv": [
+      0,
+      0,
+      1.9400000000000013,
+      1.6598627942409356
+     ],
+     "texture": "#lancet"
+    },
+    "west": {
+     "uv": [
+      0,
+      0,
+      1.9400000000000013,
+      1.6598627942409356
+     ],
+     "texture": "#lancet"
+    },
+    "up": {
+     "uv": [
+      0,
+      0,
+      1.6598627942409356,
+      1.9400000000000013
+     ],
+     "texture": "#lancet"
+    },
+    "down": {
+     "uv": [
+      0,
+      0,
+      1.6598627942409356,
+      1.9400000000000013
+     ],
+     "texture": "#lancet"
+    }
+   },
+   "rotation": {
+    "angle": 45,
+    "axis": "z",
+    "origin": [
+     8.0,
+     8.0,
+     -15.0
+    ]
+   }
+  },
+  {
+   "from": [
+    6.647973576320755,
+    6.647973576320755,
     -14.0
    ],
    "to": [
-    9.375,
-    9.375,
+    9.352026423679245,
+    9.352026423679245,
     -12.0
    ],
    "faces": {
@@ -91,8 +169,8 @@
      "uv": [
       0,
       0,
-      2.75,
-      2.75
+      2.70405284735849,
+      2.70405284735849
      ],
      "texture": "#lancet"
     },
@@ -100,8 +178,8 @@
      "uv": [
       0,
       0,
-      2.75,
-      2.75
+      2.70405284735849,
+      2.70405284735849
      ],
      "texture": "#lancet"
     },
@@ -110,7 +188,7 @@
       0,
       0,
       2.0,
-      2.75
+      2.70405284735849
      ],
      "texture": "#lancet"
     },
@@ -119,7 +197,7 @@
       0,
       0,
       2.0,
-      2.75
+      2.70405284735849
      ],
      "texture": "#lancet"
     },
@@ -127,7 +205,7 @@
      "uv": [
       0,
       0,
-      2.75,
+      2.70405284735849,
       2.0
      ],
      "texture": "#lancet"
@@ -136,7 +214,7 @@
      "uv": [
       0,
       0,
-      2.75,
+      2.70405284735849,
       2.0
      ],
      "texture": "#lancet"
@@ -145,22 +223,22 @@
   },
   {
    "from": [
-    6.375,
-    6.375,
-    -12.0
+    6.647973576320755,
+    6.647973576320755,
+    -13.97
    ],
    "to": [
-    9.625,
-    9.625,
-    -10.0
+    9.352026423679245,
+    9.352026423679245,
+    -12.03
    ],
    "faces": {
     "north": {
      "uv": [
       0,
       0,
-      3.25,
-      3.25
+      2.70405284735849,
+      2.70405284735849
      ],
      "texture": "#lancet"
     },
@@ -168,8 +246,85 @@
      "uv": [
       0,
       0,
-      3.25,
-      3.25
+      2.70405284735849,
+      2.70405284735849
+     ],
+     "texture": "#lancet"
+    },
+    "east": {
+     "uv": [
+      0,
+      0,
+      1.9400000000000013,
+      2.70405284735849
+     ],
+     "texture": "#lancet"
+    },
+    "west": {
+     "uv": [
+      0,
+      0,
+      1.9400000000000013,
+      2.70405284735849
+     ],
+     "texture": "#lancet"
+    },
+    "up": {
+     "uv": [
+      0,
+      0,
+      2.70405284735849,
+      1.9400000000000013
+     ],
+     "texture": "#lancet"
+    },
+    "down": {
+     "uv": [
+      0,
+      0,
+      2.70405284735849,
+      1.9400000000000013
+     ],
+     "texture": "#lancet"
+    }
+   },
+   "rotation": {
+    "angle": 45,
+    "axis": "z",
+    "origin": [
+     8.0,
+     8.0,
+     -13.0
+    ]
+   }
+  },
+  {
+   "from": [
+    6.256233448150251,
+    6.256233448150251,
+    -12.0
+   ],
+   "to": [
+    9.743766551849749,
+    9.743766551849749,
+    -10.0
+   ],
+   "faces": {
+    "north": {
+     "uv": [
+      0,
+      0,
+      3.487533103699498,
+      3.487533103699498
+     ],
+     "texture": "#lancet"
+    },
+    "south": {
+     "uv": [
+      0,
+      0,
+      3.487533103699498,
+      3.487533103699498
      ],
      "texture": "#lancet"
     },
@@ -178,7 +333,7 @@
       0,
       0,
       2.0,
-      3.25
+      3.487533103699498
      ],
      "texture": "#lancet"
     },
@@ -187,7 +342,7 @@
       0,
       0,
       2.0,
-      3.25
+      3.487533103699498
      ],
      "texture": "#lancet"
     },
@@ -195,7 +350,7 @@
      "uv": [
       0,
       0,
-      3.25,
+      3.487533103699498,
       2.0
      ],
      "texture": "#lancet"
@@ -204,7 +359,7 @@
      "uv": [
       0,
       0,
-      3.25,
+      3.487533103699498,
       2.0
      ],
      "texture": "#lancet"
@@ -213,13 +368,90 @@
   },
   {
    "from": [
-    6.2,
-    6.2,
+    6.256233448150251,
+    6.256233448150251,
+    -11.97
+   ],
+   "to": [
+    9.743766551849749,
+    9.743766551849749,
+    -10.03
+   ],
+   "faces": {
+    "north": {
+     "uv": [
+      0,
+      0,
+      3.487533103699498,
+      3.487533103699498
+     ],
+     "texture": "#lancet"
+    },
+    "south": {
+     "uv": [
+      0,
+      0,
+      3.487533103699498,
+      3.487533103699498
+     ],
+     "texture": "#lancet"
+    },
+    "east": {
+     "uv": [
+      0,
+      0,
+      1.9400000000000013,
+      3.487533103699498
+     ],
+     "texture": "#lancet"
+    },
+    "west": {
+     "uv": [
+      0,
+      0,
+      1.9400000000000013,
+      3.487533103699498
+     ],
+     "texture": "#lancet"
+    },
+    "up": {
+     "uv": [
+      0,
+      0,
+      3.487533103699498,
+      1.9400000000000013
+     ],
+     "texture": "#lancet"
+    },
+    "down": {
+     "uv": [
+      0,
+      0,
+      3.487533103699498,
+      1.9400000000000013
+     ],
+     "texture": "#lancet"
+    }
+   },
+   "rotation": {
+    "angle": 45,
+    "axis": "z",
+    "origin": [
+     8.0,
+     8.0,
+     -11.0
+    ]
+   }
+  },
+  {
+   "from": [
+    6.1522,
+    6.1522,
     -10.0
    ],
    "to": [
-    9.8,
-    9.8,
+    9.8478,
+    9.8478,
     20.0
    ],
    "faces": {
@@ -227,8 +459,8 @@
      "uv": [
       0,
       0,
-      3.6000000000000005,
-      3.6000000000000005
+      3.6955999999999998,
+      3.6955999999999998
      ],
      "texture": "#lancet"
     },
@@ -236,8 +468,8 @@
      "uv": [
       0,
       0,
-      3.6000000000000005,
-      3.6000000000000005
+      3.6955999999999998,
+      3.6955999999999998
      ],
      "texture": "#lancet"
     },
@@ -246,7 +478,7 @@
       0,
       0,
       16,
-      3.6000000000000005
+      3.6955999999999998
      ],
      "texture": "#lancet"
     },
@@ -255,7 +487,7 @@
       0,
       0,
       16,
-      3.6000000000000005
+      3.6955999999999998
      ],
      "texture": "#lancet"
     },
@@ -263,7 +495,7 @@
      "uv": [
       0,
       0,
-      3.6000000000000005,
+      3.6955999999999998,
       16
      ],
      "texture": "#lancet"
@@ -272,78 +504,155 @@
      "uv": [
       0,
       0,
-      3.6000000000000005,
+      3.6955999999999998,
       16
      ],
      "texture": "#lancet"
     }
    }
   },
+  {
+   "from": [
+    6.1522,
+    6.1522,
+    -9.97
+   ],
+   "to": [
+    9.8478,
+    9.8478,
+    19.97
+   ],
+   "faces": {
+    "north": {
+     "uv": [
+      0,
+      0,
+      3.6955999999999998,
+      3.6955999999999998
+     ],
+     "texture": "#lancet"
+    },
+    "south": {
+     "uv": [
+      0,
+      0,
+      3.6955999999999998,
+      3.6955999999999998
+     ],
+     "texture": "#lancet"
+    },
+    "east": {
+     "uv": [
+      0,
+      0,
+      16,
+      3.6955999999999998
+     ],
+     "texture": "#lancet"
+    },
+    "west": {
+     "uv": [
+      0,
+      0,
+      16,
+      3.6955999999999998
+     ],
+     "texture": "#lancet"
+    },
+    "up": {
+     "uv": [
+      0,
+      0,
+      3.6955999999999998,
+      16
+     ],
+     "texture": "#lancet"
+    },
+    "down": {
+     "uv": [
+      0,
+      0,
+      3.6955999999999998,
+      16
+     ],
+     "texture": "#lancet"
+    }
+   },
+   "rotation": {
+    "angle": 45,
+    "axis": "z",
+    "origin": [
+     8.0,
+     8.0,
+     4.999999999999999
+    ]
+   }
+  },
   {
    "from": [
     6.8,
-    4.8,
+    5.2,
+    -14.0
+   ],
+   "to": [
+    9.2,
+    6.4,
     -9.0
    ],
-   "to": [
-    9.2,
-    6.2,
-    -5.0
-   ],
    "faces": {
     "north": {
      "uv": [
       0,
       0,
       2.3999999999999995,
-      1.4000000000000004
+      1.2000000000000002
      ],
-     "texture": "#intake"
+     "texture": "#bare_lamp"
     },
     "south": {
      "uv": [
       0,
       0,
       2.3999999999999995,
-      1.4000000000000004
+      1.2000000000000002
      ],
-     "texture": "#intake"
+     "texture": "#bare_lamp"
     },
     "east": {
      "uv": [
       0,
       0,
-      4.0,
-      1.4000000000000004
+      5.0,
+      1.2000000000000002
      ],
-     "texture": "#intake"
+     "texture": "#bare_lamp"
     },
     "west": {
      "uv": [
       0,
       0,
-      4.0,
-      1.4000000000000004
+      5.0,
+      1.2000000000000002
      ],
-     "texture": "#intake"
+     "texture": "#bare_lamp"
     },
     "up": {
      "uv": [
       0,
       0,
       2.3999999999999995,
-      4.0
+      5.0
      ],
-     "texture": "#intake"
+     "texture": "#bare_lamp"
     },
     "down": {
      "uv": [
       0,
       0,
       2.3999999999999995,
-      4.0
+      5.0
      ],
-     "texture": "#intake"
+     "texture": "#bare_lamp"
     }
    }
   },
@@ -657,22 +966,22 @@
   },
   {
    "from": [
-    6.8,
-    6.8,
+    6.61415,
+    6.61415,
     20.0
    ],
    "to": [
-    9.2,
-    9.2,
-    22.0
+    9.38585,
+    9.38585,
+    24.0
    ],
    "faces": {
     "north": {
      "uv": [
       0,
       0,
-      2.3999999999999995,
-      2.3999999999999995
+      2.771699999999999,
+      2.771699999999999
      ],
      "texture": "#dark_metal"
     },
@@ -680,8 +989,8 @@
      "uv": [
       0,
       0,
-      2.3999999999999995,
-      2.3999999999999995
+      2.771699999999999,
+      2.771699999999999
      ],
      "texture": "#dark_metal"
     },
@@ -689,8 +998,8 @@
      "uv": [
       0,
       0,
-      2.0,
-      2.3999999999999995
+      4.0,
+      2.771699999999999
      ],
      "texture": "#dark_metal"
     },
@@ -698,8 +1007,8 @@
      "uv": [
       0,
       0,
-      2.0,
-      2.3999999999999995
+      4.0,
+      2.771699999999999
      ],
      "texture": "#dark_metal"
     },
@@ -707,8 +1016,8 @@
      "uv": [
       0,
       0,
-      2.3999999999999995,
-      2.0
+      2.771699999999999,
+      4.0
      ],
      "texture": "#dark_metal"
     },
@@ -716,12 +1025,225 @@
      "uv": [
       0,
       0,
-      2.3999999999999995,
-      2.0
+      2.771699999999999,
+      4.0
      ],
      "texture": "#dark_metal"
     }
    }
+  },
+  {
+   "from": [
+    6.61415,
+    6.61415,
+    20.03
+   ],
+   "to": [
+    9.38585,
+    9.38585,
+    23.97
+   ],
+   "faces": {
+    "north": {
+     "uv": [
+      0,
+      0,
+      2.771699999999999,
+      2.771699999999999
+     ],
+     "texture": "#dark_metal"
+    },
+    "south": {
+     "uv": [
+      0,
+      0,
+      2.771699999999999,
+      2.771699999999999
+     ],
+     "texture": "#dark_metal"
+    },
+    "east": {
+     "uv": [
+      0,
+      0,
+      3.9399999999999977,
+      2.771699999999999
+     ],
+     "texture": "#dark_metal"
+    },
+    "west": {
+     "uv": [
+      0,
+      0,
+      3.9399999999999977,
+      2.771699999999999
+     ],
+     "texture": "#dark_metal"
+    },
+    "up": {
+     "uv": [
+      0,
+      0,
+      2.771699999999999,
+      3.9399999999999977
+     ],
+     "texture": "#dark_metal"
+    },
+    "down": {
+     "uv": [
+      0,
+      0,
+      2.771699999999999,
+      3.9399999999999977
+     ],
+     "texture": "#dark_metal"
+    }
+   },
+   "rotation": {
+    "angle": 45,
+    "axis": "z",
+    "origin": [
+     8.0,
+     8.0,
+     22.0
+    ]
+   }
+  },
+  {
+   "from": [
+    3.0,
+    7.85,
+    24.0
+   ],
+   "to": [
+    13.0,
+    8.15,
+    24.5
+   ],
+   "faces": {
+    "north": {
+     "uv": [
+      0,
+      0,
+      10.0,
+      0.3000000000000007
+     ],
+     "texture": "#prop"
+    },
+    "south": {
+     "uv": [
+      0,
+      0,
+      10.0,
+      0.3000000000000007
+     ],
+     "texture": "#prop"
+    },
+    "east": {
+     "uv": [
+      0,
+      0,
+      0.5,
+      0.3000000000000007
+     ],
+     "texture": "#prop"
+    },
+    "west": {
+     "uv": [
+      0,
+      0,
+      0.5,
+      0.3000000000000007
+     ],
+     "texture": "#prop"
+    },
+    "up": {
+     "uv": [
+      0,
+      0,
+      10.0,
+      0.5
+     ],
+     "texture": "#prop"
+    },
+    "down": {
+     "uv": [
+      0,
+      0,
+      10.0,
+      0.5
+     ],
+     "texture": "#prop"
+    }
+   }
+  },
+  {
+   "from": [
+    7.85,
+    3.0,
+    24.0
+   ],
+   "to": [
+    8.15,
+    13.0,
+    24.5
+   ],
+   "faces": {
+    "north": {
+     "uv": [
+      0,
+      0,
+      0.3000000000000007,
+      10.0
+     ],
+     "texture": "#prop"
+    },
+    "south": {
+     "uv": [
+      0,
+      0,
+      0.3000000000000007,
+      10.0
+     ],
+     "texture": "#prop"
+    },
+    "east": {
+     "uv": [
+      0,
+      0,
+      0.5,
+      10.0
+     ],
+     "texture": "#prop"
+    },
+    "west": {
+     "uv": [
+      0,
+      0,
+      0.5,
+      10.0
+     ],
+     "texture": "#prop"
+    },
+    "up": {
+     "uv": [
+      0,
+      0,
+      0.3000000000000007,
+      0.5
+     ],
+     "texture": "#prop"
+    },
+    "down": {
+     "uv": [
+      0,
+      0,
+      0.3000000000000007,
+      0.5
+     ],
+     "texture": "#prop"
+    }
+   }
   }
  ]
 }

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": [
   {

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"
+    }
+   }
+  }
+ ]
+}

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
+    ]
+   }
   }
  ]
 }

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
+    ]
+   }
+  }
+ ]
+}

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": [
   {

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"
+    }
+   }
+  }
+ ]
+}

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"
     }
    }
   },

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"
+    }
+   }
+  }
+ ]
+}

airdef-mod/assets/airdef/models/block/pantsir_turret.json

@@ -4,6 +4,9 @@
   "ru_green": "airdef:block/ru_green",
   "radar_face": "airdef:block/radar_face",
   "metal": "airdef:block/metal",
+  "dark_metal": "airdef:block/dark_metal",
+  "bare_lamp": "airdef:block/bare_lamp",
+  "mk_ru": "airdef:block/mk_ru",
   "particle": "airdef:block/ru_green"
  },
  "elements": [
@@ -278,6 +281,346 @@
      "texture": "#ru_green"
     }
    }
+  },
+  {
+   "from": [
+    5.0,
+    10.0,
+    -4.0
+   ],
+   "to": [
+    11.0,
+    13.0,
+    0.0
+   ],
+   "faces": {
+    "north": {
+     "uv": [
+      0,
+      0,
+      6.0,
+      3.0
+     ],
+     "texture": "#dark_metal"
+    },
+    "south": {
+     "uv": [
+      0,
+      0,
+      6.0,
+      3.0
+     ],
+     "texture": "#dark_metal"
+    },
+    "east": {
+     "uv": [
+      0,
+      0,
+      4.0,
+      3.0
+     ],
+     "texture": "#dark_metal"
+    },
+    "west": {
+     "uv": [
+      0,
+      0,
+      4.0,
+      3.0
+     ],
+     "texture": "#dark_metal"
+    },
+    "up": {
+     "uv": [
+      0,
+      0,
+      6.0,
+      4.0
+     ],
+     "texture": "#dark_metal"
+    },
+    "down": {
+     "uv": [
+      0,
+      0,
+      6.0,
+      4.0
+     ],
+     "texture": "#dark_metal"
+    }
+   }
+  },
+  {
+   "from": [
+    6.0,
+    10.5,
+    -4.4
+   ],
+   "to": [
+    10.0,
+    12.5,
+    -4.0
+   ],
+   "faces": {
+    "north": {
+     "uv": [
+      0,
+      0,
+      4.0,
+      2.0
+     ],
+     "texture": "#bare_lamp"
+    },
+    "south": {
+     "uv": [
+      0,
+      0,
+      4.0,
+      2.0
+     ],
+     "texture": "#bare_lamp"
+    },
+    "east": {
+     "uv": [
+      0,
+      0,
+      0.40000000000000036,
+      2.0
+     ],
+     "texture": "#bare_lamp"
+    },
+    "west": {
+     "uv": [
+      0,
+      0,
+      0.40000000000000036,
+      2.0
+     ],
+     "texture": "#bare_lamp"
+    },
+    "up": {
+     "uv": [
+      0,
+      0,
+      4.0,
+      0.40000000000000036
+     ],
+     "texture": "#bare_lamp"
+    },
+    "down": {
+     "uv": [
+      0,
+      0,
+      4.0,
+      0.40000000000000036
+     ],
+     "texture": "#bare_lamp"
+    }
+   }
+  },
+  {
+   "from": [
+    1.0,
+    12.0,
+    10.0
+   ],
+   "to": [
+    15.0,
+    12.6,
+    15.0
+   ],
+   "faces": {
+    "north": {
+     "uv": [
+      0,
+      0,
+      14.0,
+      0.5999999999999996
+     ],
+     "texture": "#metal"
+    },
+    "south": {
+     "uv": [
+      0,
+      0,
+      14.0,
+      0.5999999999999996
+     ],
+     "texture": "#metal"
+    },
+    "east": {
+     "uv": [
+      0,
+      0,
+      5.0,
+      0.5999999999999996
+     ],
+     "texture": "#metal"
+    },
+    "west": {
+     "uv": [
+      0,
+      0,
+      5.0,
+      0.5999999999999996
+     ],
+     "texture": "#metal"
+    },
+    "up": {
+     "uv": [
+      0,
+      0,
+      14.0,
+      5.0
+     ],
+     "texture": "#metal"
+    },
+    "down": {
+     "uv": [
+      0,
+      0,
+      14.0,
+      5.0
+     ],
+     "texture": "#metal"
+    }
+   }
+  },
+  {
+   "from": [
+    18.0,
+    3.0,
+    -4.0
+   ],
+   "to": [
+    18.119999999999997,
+    6.5,
+    3.0
+   ],
+   "faces": {
+    "north": {
+     "uv": [
+      0,
+      0,
+      0.25,
+      3.5
+     ],
+     "texture": "#mk_ru"
+    },
+    "south": {
+     "uv": [
+      0,
+      0,
+      0.25,
+      3.5
+     ],
+     "texture": "#mk_ru"
+    },
+    "east": {
+     "uv": [
+      0,
+      0,
+      7.0,
+      3.5
+     ],
+     "texture": "#mk_ru"
+    },
+    "west": {
+     "uv": [
+      0,
+      0,
+      7.0,
+      3.5
+     ],
+     "texture": "#mk_ru"
+    },
+    "up": {
+     "uv": [
+      0,
+      0,
+      0.25,
+      7.0
+     ],
+     "texture": "#mk_ru"
+    },
+    "down": {
+     "uv": [
+      0,
+      0,
+      0.25,
+      7.0
+     ],
+     "texture": "#mk_ru"
+    }
+   }
+  },
+  {
+   "from": [
+    -2.1199999999999974,
+    3.0,
+    -4.0
+   ],
+   "to": [
+    -2.0,
+    6.5,
+    3.0
+   ],
+   "faces": {
+    "north": {
+     "uv": [
+      0,
+      0,
+      0.25,
+      3.5
+     ],
+     "texture": "#mk_ru"
+    },
+    "south": {
+     "uv": [
+      0,
+      0,
+      0.25,
+      3.5
+     ],
+     "texture": "#mk_ru"
+    },
+    "east": {
+     "uv": [
+      0,
+      0,
+      7.0,
+      3.5
+     ],
+     "texture": "#mk_ru"
+    },
+    "west": {
+     "uv": [
+      0,
+      0,
+      7.0,
+      3.5
+     ],
+     "texture": "#mk_ru"
+    },
+    "up": {
+     "uv": [
+      0,
+      0,
+      0.25,
+      7.0
+     ],
+     "texture": "#mk_ru"
+    },
+    "down": {
+     "uv": [
+      0,
+      0,
+      0.25,
+      7.0
+     ],
+     "texture": "#mk_ru"
+    }
+   }
   }
  ]
 }

airdef-mod/assets/airdef/models/block/pantsir_turret_burnt.json

@@ -0,0 +1,558 @@
+{
+ "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",
+  "dark_metal_b": "airdef:block/dark_metal_b",
+  "bare_lamp_b": "airdef:block/bare_lamp_b",
+  "mk_ru_b": "airdef:block/mk_ru_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"
+    }
+   }
+  },
+  {
+   "from": [
+    5.0,
+    10.0,
+    -4.0
+   ],
+   "to": [
+    11.0,
+    13.0,
+    0.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,
+      4.0,
+      3.0
+     ],
+     "texture": "#dark_metal_b"
+    },
+    "west": {
+     "uv": [
+      0,
+      0,
+      4.0,
+      3.0
+     ],
+     "texture": "#dark_metal_b"
+    },
+    "up": {
+     "uv": [
+      0,
+      0,
+      6.0,
+      4.0
+     ],
+     "texture": "#dark_metal_b"
+    },
+    "down": {
+     "uv": [
+      0,
+      0,
+      6.0,
+      4.0
+     ],
+     "texture": "#dark_metal_b"
+    }
+   }
+  },
+  {
+   "from": [
+    6.0,
+    10.5,
+    -4.4
+   ],
+   "to": [
+    10.0,
+    12.5,
+    -4.0
+   ],
+   "faces": {
+    "north": {
+     "uv": [
+      0,
+      0,
+      4.0,
+      2.0
+     ],
+     "texture": "#bare_lamp_b"
+    },
+    "south": {
+     "uv": [
+      0,
+      0,
+      4.0,
+      2.0
+     ],
+     "texture": "#bare_lamp_b"
+    },
+    "east": {
+     "uv": [
+      0,
+      0,
+      0.40000000000000036,
+      2.0
+     ],
+     "texture": "#bare_lamp_b"
+    },
+    "west": {
+     "uv": [
+      0,
+      0,
+      0.40000000000000036,
+      2.0
+     ],
+     "texture": "#bare_lamp_b"
+    },
+    "up": {
+     "uv": [
+      0,
+      0,
+      4.0,
+      0.40000000000000036
+     ],
+     "texture": "#bare_lamp_b"
+    },
+    "down": {
+     "uv": [
+      0,
+      0,
+      4.0,
+      0.40000000000000036
+     ],
+     "texture": "#bare_lamp_b"
+    }
+   }
+  },
+  {
+   "from": [
+    1.0,
+    12.0,
+    10.0
+   ],
+   "to": [
+    15.0,
+    12.6,
+    15.0
+   ],
+   "faces": {
+    "north": {
+     "uv": [
+      0,
+      0,
+      14.0,
+      0.5999999999999996
+     ],
+     "texture": "#metal_b"
+    },
+    "south": {
+     "uv": [
+      0,
+      0,
+      14.0,
+      0.5999999999999996
+     ],
+     "texture": "#metal_b"
+    },
+    "east": {
+     "uv": [
+      0,
+      0,
+      5.0,
+      0.5999999999999996
+     ],
+     "texture": "#metal_b"
+    },
+    "west": {
+     "uv": [
+      0,
+      0,
+      5.0,
+      0.5999999999999996
+     ],
+     "texture": "#metal_b"
+    },
+    "up": {
+     "uv": [
+      0,
+      0,
+      14.0,
+      5.0
+     ],
+     "texture": "#metal_b"
+    },
+    "down": {
+     "uv": [
+      0,
+      0,
+      14.0,
+      5.0
+     ],
+     "texture": "#metal_b"
+    }
+   }
+  },
+  {
+   "from": [
+    -2.1199999999999974,
+    3.0,
+    -4.0
+   ],
+   "to": [
+    -2.0,
+    6.5,
+    3.0
+   ],
+   "faces": {
+    "north": {
+     "uv": [
+      0,
+      0,
+      0.25,
+      3.5
+     ],
+     "texture": "#mk_ru_b"
+    },
+    "south": {
+     "uv": [
+      0,
+      0,
+      0.25,
+      3.5
+     ],
+     "texture": "#mk_ru_b"
+    },
+    "east": {
+     "uv": [
+      0,
+      0,
+      7.0,
+      3.5
+     ],
+     "texture": "#mk_ru_b"
+    },
+    "west": {
+     "uv": [
+      0,
+      0,
+      7.0,
+      3.5
+     ],
+     "texture": "#mk_ru_b"
+    },
+    "up": {
+     "uv": [
+      0,
+      0,
+      0.25,
+      7.0
+     ],
+     "texture": "#mk_ru_b"
+    },
+    "down": {
+     "uv": [
+      0,
+      0,
+      0.25,
+      7.0
+     ],
+     "texture": "#mk_ru_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
+    ]
+   }
   }
  ]
 }

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,

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"
+    }
+   }
+  }
+ ]
+}

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
+    ]
+   }
   }
  ]
 }

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": [
   {

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"
+    }
+   }
+  }
+ ]
+}

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": [
   {

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"
+    }
+   }
+  }
+ ]
+}