From cfbd4c05cee70b7c343a7649b416603faee6f707 Mon Sep 17 00:00:00 2001
From: austin <austin@austinhoover.net>
Date: Sun, 5 May 2024 19:11:26 -0400
Subject: [PATCH] fix tree data

---
 assets/Data/foliage.json                                    | 2 +-
 assets/Models/modelPretransforms.json                       | 4 ++--
 assets/Textures/default_texture_map.json                    | 6 +++---
 .../electrosphere/entity/types/tree/ProceduralTree.java     | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/assets/Data/foliage.json b/assets/Data/foliage.json
index ff274204..0a541833 100644
--- a/assets/Data/foliage.json
+++ b/assets/Data/foliage.json
@@ -92,7 +92,7 @@
                 "gainMultiplier": 0.9,
                 "emitterSpatialOffset": [0,3,0]
             },
-            "modelPath" : "Models/proceduralTree2/proceduralTree2v2.fbx"
+            "modelPath" : "Models/foliage/proceduralTree2/proceduralTree2v2.fbx"
         }
 
     ]
diff --git a/assets/Models/modelPretransforms.json b/assets/Models/modelPretransforms.json
index 7cd4ee8d..2e34dc85 100644
--- a/assets/Models/modelPretransforms.json
+++ b/assets/Models/modelPretransforms.json
@@ -23,7 +23,7 @@
             ]
         },
         {
-            "path" : "Models/proceduralTree2/proceduralTree2v2.fbx",
+            "path" : "Models/foliage/proceduralTree2/proceduralTree2v2.fbx",
             "meshes" : [
                 {
                     "meshName" : "Trunk",
@@ -34,7 +34,7 @@
             ]
         },
         {
-            "path" : "Models/foliageBlockTemplate1Test1.fbx",
+            "path" : "Models/foliage/foliageBlockTemplate1Test1.fbx",
             "meshes" : [
                 {
                     "meshName" : "Plane",
diff --git a/assets/Textures/default_texture_map.json b/assets/Textures/default_texture_map.json
index bc7dbdef..3081a41b 100644
--- a/assets/Textures/default_texture_map.json
+++ b/assets/Textures/default_texture_map.json
@@ -432,7 +432,7 @@
                 "Textures/skyscraper1.png"
             ]
         },
-        "Models/foliageBlockTemplate1Test1.fbx" : {
+        "Models/foliage/foliageBlockTemplate1Test1.fbx" : {
             "Plane" : [
                 "Textures/leaf3layer1.png",
                 "Textures/leaf3layer1.png"
@@ -454,8 +454,8 @@
         },
         "Models/proceduralTree2/proceduralTree2v2.fbx": {
             "Trunk" : [
-                "Models/proceduralTree2/Trunk.png",
-                "Models/proceduralTree2/Trunk.png"
+                "Models/foliage/proceduralTree2/Trunk.png",
+                "Models/foliage/proceduralTree2/Trunk.png"
             ]
         }
     }
diff --git a/src/main/java/electrosphere/entity/types/tree/ProceduralTree.java b/src/main/java/electrosphere/entity/types/tree/ProceduralTree.java
index 91eccb9a..4620614f 100644
--- a/src/main/java/electrosphere/entity/types/tree/ProceduralTree.java
+++ b/src/main/java/electrosphere/entity/types/tree/ProceduralTree.java
@@ -82,7 +82,7 @@ public class ProceduralTree {
 
         branchInstanceTemplate = InstanceTemplate.createInstanceTemplate(
             1000,
-            "Models/proceduralTree2/proceduralTree2v2.fbx",
+            "Models/foliage/proceduralTree2/proceduralTree2v2.fbx",
             "Shaders/instanced/proceduraltree/proceduraltree.vs",
             "Shaders/instanced/proceduraltree/proceduraltree.fs",
             attributes);
@@ -92,7 +92,7 @@ public class ProceduralTree {
         leafAttributes.put(leafColorAttribute, HomogenousBufferTypes.VEC3F);
         leafInstanceTemplate = InstanceTemplate.createInstanceTemplate(
             10000,
-            "Models/foliageBlockTemplate1Test1.fbx",
+            "Models/foliage/foliageBlockTemplate1Test1.fbx",
             "Shaders/instanced/colorshift/colorshift.vs",
             "Shaders/instanced/colorshift/colorshift.fs",
             leafAttributes