From 8f23732af7420e0694351a08fd495c8c3c7e3d82 Mon Sep 17 00:00:00 2001
From: s-prechtl <sprechtl@htl-steyr.ac.at>
Date: Fri, 3 Jun 2022 14:55:53 +0200
Subject: [PATCH] ItemContainer.cs finished, Resources folder

---
 Assets/Resources.meta                             |  8 ++++++++
 Assets/{ => Resources}/Items.meta                 |  0
 Assets/{ => Resources}/Items/Usable.meta          |  0
 .../{ => Resources}/Items/Usable/FishingRod.asset |  0
 .../Items/Usable/FishingRod.asset.meta            |  0
 Assets/{ => Resources}/Items/Usable/Hoe.asset     |  0
 .../{ => Resources}/Items/Usable/Hoe.asset.meta   |  0
 Assets/{ => Resources}/Items/Usable/Scythe.asset  |  0
 .../Items/Usable/Scythe.asset.meta                |  0
 .../Items/Usable/WateringCan.asset                |  0
 .../Items/Usable/WateringCan.asset.meta           |  0
 .../{ => Resources}/Items/Usable/WheatSeed.asset  |  0
 .../Items/Usable/WheatSeed.asset.meta             |  0
 Assets/Scripts/ItemContainer.cs                   | 15 ++++++++-------
 14 files changed, 16 insertions(+), 7 deletions(-)
 create mode 100644 Assets/Resources.meta
 rename Assets/{ => Resources}/Items.meta (100%)
 rename Assets/{ => Resources}/Items/Usable.meta (100%)
 rename Assets/{ => Resources}/Items/Usable/FishingRod.asset (100%)
 rename Assets/{ => Resources}/Items/Usable/FishingRod.asset.meta (100%)
 rename Assets/{ => Resources}/Items/Usable/Hoe.asset (100%)
 rename Assets/{ => Resources}/Items/Usable/Hoe.asset.meta (100%)
 rename Assets/{ => Resources}/Items/Usable/Scythe.asset (100%)
 rename Assets/{ => Resources}/Items/Usable/Scythe.asset.meta (100%)
 rename Assets/{ => Resources}/Items/Usable/WateringCan.asset (100%)
 rename Assets/{ => Resources}/Items/Usable/WateringCan.asset.meta (100%)
 rename Assets/{ => Resources}/Items/Usable/WheatSeed.asset (100%)
 rename Assets/{ => Resources}/Items/Usable/WheatSeed.asset.meta (100%)

diff --git a/Assets/Resources.meta b/Assets/Resources.meta
new file mode 100644
index 0000000..dd055b1
--- /dev/null
+++ b/Assets/Resources.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 8b977fe7024d2b149b7f9de4cde55925
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Items.meta b/Assets/Resources/Items.meta
similarity index 100%
rename from Assets/Items.meta
rename to Assets/Resources/Items.meta
diff --git a/Assets/Items/Usable.meta b/Assets/Resources/Items/Usable.meta
similarity index 100%
rename from Assets/Items/Usable.meta
rename to Assets/Resources/Items/Usable.meta
diff --git a/Assets/Items/Usable/FishingRod.asset b/Assets/Resources/Items/Usable/FishingRod.asset
similarity index 100%
rename from Assets/Items/Usable/FishingRod.asset
rename to Assets/Resources/Items/Usable/FishingRod.asset
diff --git a/Assets/Items/Usable/FishingRod.asset.meta b/Assets/Resources/Items/Usable/FishingRod.asset.meta
similarity index 100%
rename from Assets/Items/Usable/FishingRod.asset.meta
rename to Assets/Resources/Items/Usable/FishingRod.asset.meta
diff --git a/Assets/Items/Usable/Hoe.asset b/Assets/Resources/Items/Usable/Hoe.asset
similarity index 100%
rename from Assets/Items/Usable/Hoe.asset
rename to Assets/Resources/Items/Usable/Hoe.asset
diff --git a/Assets/Items/Usable/Hoe.asset.meta b/Assets/Resources/Items/Usable/Hoe.asset.meta
similarity index 100%
rename from Assets/Items/Usable/Hoe.asset.meta
rename to Assets/Resources/Items/Usable/Hoe.asset.meta
diff --git a/Assets/Items/Usable/Scythe.asset b/Assets/Resources/Items/Usable/Scythe.asset
similarity index 100%
rename from Assets/Items/Usable/Scythe.asset
rename to Assets/Resources/Items/Usable/Scythe.asset
diff --git a/Assets/Items/Usable/Scythe.asset.meta b/Assets/Resources/Items/Usable/Scythe.asset.meta
similarity index 100%
rename from Assets/Items/Usable/Scythe.asset.meta
rename to Assets/Resources/Items/Usable/Scythe.asset.meta
diff --git a/Assets/Items/Usable/WateringCan.asset b/Assets/Resources/Items/Usable/WateringCan.asset
similarity index 100%
rename from Assets/Items/Usable/WateringCan.asset
rename to Assets/Resources/Items/Usable/WateringCan.asset
diff --git a/Assets/Items/Usable/WateringCan.asset.meta b/Assets/Resources/Items/Usable/WateringCan.asset.meta
similarity index 100%
rename from Assets/Items/Usable/WateringCan.asset.meta
rename to Assets/Resources/Items/Usable/WateringCan.asset.meta
diff --git a/Assets/Items/Usable/WheatSeed.asset b/Assets/Resources/Items/Usable/WheatSeed.asset
similarity index 100%
rename from Assets/Items/Usable/WheatSeed.asset
rename to Assets/Resources/Items/Usable/WheatSeed.asset
diff --git a/Assets/Items/Usable/WheatSeed.asset.meta b/Assets/Resources/Items/Usable/WheatSeed.asset.meta
similarity index 100%
rename from Assets/Items/Usable/WheatSeed.asset.meta
rename to Assets/Resources/Items/Usable/WheatSeed.asset.meta
diff --git a/Assets/Scripts/ItemContainer.cs b/Assets/Scripts/ItemContainer.cs
index a62ff92..6d265bc 100644
--- a/Assets/Scripts/ItemContainer.cs
+++ b/Assets/Scripts/ItemContainer.cs
@@ -18,17 +18,18 @@ public class ItemContainer : MonoBehaviour {
     }
 
     #endregion
-    
+
     private List<Item> _allItems;
 
-    private void Start() {
-        string[] files = 
-            Directory.GetFiles("Assets/Items", "*.cs", SearchOption.AllDirectories);
+    void Start() {
+        _allItems ??= new List<Item>();
+        Debug.Log("Itemcontainer started");
+        string[] files =
+            Directory.GetFiles("Assets\\Resources\\Items", "*.asset", SearchOption.AllDirectories);
         foreach (string file in files) {
-           _allItems.Add(Resources.Load<Item>("Assets/Items/" + file));            
+            String path = file.Replace("Assets\\Resources\\", "").Replace(".asset", "");
+           _allItems.Add(Resources.Load<Item>(path));
         }
-        Debug.Log(files);
-        Debug.Log(_allItems);
     }
 
     public Item GetItemByName(String name) {