From 29d9c9dcaef32477861b78836bc31ed7515cb1eb Mon Sep 17 00:00:00 2001
From: Isse <isidornie@gmail.com>
Date: Mon, 13 Mar 2023 00:54:22 +0100
Subject: [PATCH] move key and lockpick models to voxel folder

---
 assets/voxygen/item_image_manifest.ron                        | 4 ++--
 assets/voxygen/voxel/item_drop_manifest.ron                   | 4 ++--
 .../voxygen/{element/items => voxel/object}/key_rusty-0.vox   | 0
 assets/voxygen/{element/items => voxel/object}/lockpick.vox   | 0
 4 files changed, 4 insertions(+), 4 deletions(-)
 rename assets/voxygen/{element/items => voxel/object}/key_rusty-0.vox (100%)
 rename assets/voxygen/{element/items => voxel/object}/lockpick.vox (100%)

diff --git a/assets/voxygen/item_image_manifest.ron b/assets/voxygen/item_image_manifest.ron
index 81ca68ff4f..bffe0c69ca 100644
--- a/assets/voxygen/item_image_manifest.ron
+++ b/assets/voxygen/item_image_manifest.ron
@@ -4822,12 +4822,12 @@
     ),
     // Keys
     Simple("common.items.keys.rusty_tower_key"): VoxTrans(
-        "element.items.key_rusty-0",
+        "voxel.object.key_rusty-0",
         (0.0, 0.0, 0.0), (-100.0, 250.0, 15.0), 1.0,
     ),
     // Lockpicks
     Simple("common.items.utility.lockpick_0"): VoxTrans(
-        "element.items.lockpick",
+        "voxel.object.lockpick",
         (0.0, 0.0, 0.0), (-100.0, 250.0, 15.0), 1.0,
     ),
 })
diff --git a/assets/voxygen/voxel/item_drop_manifest.ron b/assets/voxygen/voxel/item_drop_manifest.ron
index e7ecee284c..87f4a326d3 100644
--- a/assets/voxygen/voxel/item_drop_manifest.ron
+++ b/assets/voxygen/voxel/item_drop_manifest.ron
@@ -920,8 +920,8 @@
     Simple("common.items.log.ironwood"): "voxel.sprite.wood.item.ironwood",
     Simple("common.items.log.wood"): "voxel.sprite.wood.item.wood",
     // Keys and Lockpicks
-    Simple("common.items.keys.rusty_tower_key"): "element.items.key_rusty-0",
-    Simple("common.items.utility.lockpick_0"): "element.items.lockpick",
+    Simple("common.items.keys.rusty_tower_key"): "voxel.object.key_rusty-0",
+    Simple("common.items.utility.lockpick_0"): "voxel.object.lockpick",
     // Gliders
     Simple("common.items.glider.cloverleaf"): "voxel.glider.starter",
     Simple("common.items.glider.basic_white"): "voxel.glider.basic_white",
diff --git a/assets/voxygen/element/items/key_rusty-0.vox b/assets/voxygen/voxel/object/key_rusty-0.vox
similarity index 100%
rename from assets/voxygen/element/items/key_rusty-0.vox
rename to assets/voxygen/voxel/object/key_rusty-0.vox
diff --git a/assets/voxygen/element/items/lockpick.vox b/assets/voxygen/voxel/object/lockpick.vox
similarity index 100%
rename from assets/voxygen/element/items/lockpick.vox
rename to assets/voxygen/voxel/object/lockpick.vox