From 086f9737e4c906d1cc335b15c868e23ea6ffa8d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcel=20M=C3=A4rtens?= <marcel.cochem@googlemail.com>
Date: Mon, 15 Nov 2021 16:39:39 +0100
Subject: [PATCH] move server.voxel for airship to common

---
 assets/{server => common}/voxel/air_balloon/rudder.vox        | 0
 assets/{server => common}/voxel/air_balloon/structure.vox     | 0
 assets/{server => common}/voxel/airship_human/propeller-l.vox | 0
 assets/{server => common}/voxel/airship_human/propeller-r.vox | 0
 assets/{server => common}/voxel/airship_human/rudder.vox      | 0
 assets/{server => common}/voxel/airship_human/structure.vox   | 0
 assets/{server => common}/voxel/empty.vox                     | 0
 assets/{server => common}/voxel/galleon/structure.vox         | 0
 assets/{server => common}/voxel/sail_boat/structure.vox       | 0
 common/src/comp/body/ship.rs                                  | 4 ++--
 voxygen/src/scene/figure/load.rs                              | 2 +-
 11 files changed, 3 insertions(+), 3 deletions(-)
 rename assets/{server => common}/voxel/air_balloon/rudder.vox (100%)
 rename assets/{server => common}/voxel/air_balloon/structure.vox (100%)
 rename assets/{server => common}/voxel/airship_human/propeller-l.vox (100%)
 rename assets/{server => common}/voxel/airship_human/propeller-r.vox (100%)
 rename assets/{server => common}/voxel/airship_human/rudder.vox (100%)
 rename assets/{server => common}/voxel/airship_human/structure.vox (100%)
 rename assets/{server => common}/voxel/empty.vox (100%)
 rename assets/{server => common}/voxel/galleon/structure.vox (100%)
 rename assets/{server => common}/voxel/sail_boat/structure.vox (100%)

diff --git a/assets/server/voxel/air_balloon/rudder.vox b/assets/common/voxel/air_balloon/rudder.vox
similarity index 100%
rename from assets/server/voxel/air_balloon/rudder.vox
rename to assets/common/voxel/air_balloon/rudder.vox
diff --git a/assets/server/voxel/air_balloon/structure.vox b/assets/common/voxel/air_balloon/structure.vox
similarity index 100%
rename from assets/server/voxel/air_balloon/structure.vox
rename to assets/common/voxel/air_balloon/structure.vox
diff --git a/assets/server/voxel/airship_human/propeller-l.vox b/assets/common/voxel/airship_human/propeller-l.vox
similarity index 100%
rename from assets/server/voxel/airship_human/propeller-l.vox
rename to assets/common/voxel/airship_human/propeller-l.vox
diff --git a/assets/server/voxel/airship_human/propeller-r.vox b/assets/common/voxel/airship_human/propeller-r.vox
similarity index 100%
rename from assets/server/voxel/airship_human/propeller-r.vox
rename to assets/common/voxel/airship_human/propeller-r.vox
diff --git a/assets/server/voxel/airship_human/rudder.vox b/assets/common/voxel/airship_human/rudder.vox
similarity index 100%
rename from assets/server/voxel/airship_human/rudder.vox
rename to assets/common/voxel/airship_human/rudder.vox
diff --git a/assets/server/voxel/airship_human/structure.vox b/assets/common/voxel/airship_human/structure.vox
similarity index 100%
rename from assets/server/voxel/airship_human/structure.vox
rename to assets/common/voxel/airship_human/structure.vox
diff --git a/assets/server/voxel/empty.vox b/assets/common/voxel/empty.vox
similarity index 100%
rename from assets/server/voxel/empty.vox
rename to assets/common/voxel/empty.vox
diff --git a/assets/server/voxel/galleon/structure.vox b/assets/common/voxel/galleon/structure.vox
similarity index 100%
rename from assets/server/voxel/galleon/structure.vox
rename to assets/common/voxel/galleon/structure.vox
diff --git a/assets/server/voxel/sail_boat/structure.vox b/assets/common/voxel/sail_boat/structure.vox
similarity index 100%
rename from assets/server/voxel/sail_boat/structure.vox
rename to assets/common/voxel/sail_boat/structure.vox
diff --git a/common/src/comp/body/ship.rs b/common/src/comp/body/ship.rs
index 2d6f6d8fdd..0b429d3bc2 100644
--- a/common/src/comp/body/ship.rs
+++ b/common/src/comp/body/ship.rs
@@ -207,10 +207,10 @@ pub mod figuredata {
             for (_, spec) in (manifest.read().0).0.iter() {
                 for bone in [&spec.bone0, &spec.bone1, &spec.bone2].iter() {
                     // TODO: Currently both client and server load models and manifests from
-                    // "server.voxel.". In order to support CSG procedural airships, we probably
+                    // "common.voxel.". In order to support CSG procedural airships, we probably
                     // need to load them in the server and sync them as an ECS resource.
                     let vox =
-                        cache.load::<DotVoxAsset>(&["server.voxel.", &bone.central.0].concat())?;
+                        cache.load::<DotVoxAsset>(&["common.voxel.", &bone.central.0].concat())?;
                     let dyna = Dyna::<Cell, (), ColumnAccess>::from_vox(&vox.read().0, false);
                     let dyna = dyna.map_into(|cell| {
                         if let Some(rgb) = cell.get_color() {
diff --git a/voxygen/src/scene/figure/load.rs b/voxygen/src/scene/figure/load.rs
index 632044255b..7da8c90bb7 100644
--- a/voxygen/src/scene/figure/load.rs
+++ b/voxygen/src/scene/figure/load.rs
@@ -4536,7 +4536,7 @@ fn mesh_ship_bone<K: fmt::Debug + Eq + Hash, V, F: Fn(&V) -> &ShipCentralSubSpec
         },
     };
     let bone = f(spec);
-    let central = graceful_load_segment_fullspec(&["server.voxel.", &bone.central.0].concat());
+    let central = graceful_load_segment_fullspec(&["common.voxel.", &bone.central.0].concat());
 
     (central, Vec3::from(bone.offset))
 }