Update app.py

app.py

@@ -1,11 +1,10 @@
-# app.py
 import streamlit as st  # 🌐 Streamlit magic
 import streamlit.components.v1 as components  # 🖼️ Embed custom HTML/JS
 import os  # 📂 File operations
 import json  # 🔄 JSON encoding/decoding
 import pandas as pd  # 📊 DataFrame handling
 import uuid  # 🆔 Unique IDs
-import math  # ➗ Math utilities
+import math  # ➗ Math utils
 import time  # ⏳ Time utilities
 
 from gamestate import GameState  # 💼 Shared game-state singleton
@@ -23,157 +22,219 @@ CSV_COLUMNS = [
     'rot_x', 'rot_y', 'rot_z', 'rot_order'
 ]
 
-# 🗂️ Ensure directory for saved plots
+# 🗂️ Ensure directory for plots exists
 os.makedirs(SAVE_DIR, exist_ok=True)
 
-# 🔧 Load prefab kits definitions
-@st.cache_data(ttl=3600)
-def load_kits():
-    try:
-        with open("kits.json", "r", encoding="utf-8") as f:
-            return json.load(f)
-    except FileNotFoundError:
-        st.error("kits.json missing! 📦")
-        return {}
-    except Exception as e:
-        st.error(f"Error loading kits.json: {e}")
-        return {}
-
-kits = load_kits()  # 🔗 name → module list
-
-# --- Existing load/save/state functions ---
-@st.cache_data(ttl=3600)
+@st.cache_data(ttl=3600)  # 🕒 Cache for 1h
 def load_plot_metadata():
+    # 🔍 Scan SAVE_DIR for plot CSVs
     try:
-        files = [f for f in os.listdir(SAVE_DIR) if f.endswith('.csv') and f.startswith('plot_X')]
+        plot_files = [f for f in os.listdir(SAVE_DIR)
+                      if f.endswith(".csv") and f.startswith("plot_X")]
+    except FileNotFoundError:
+        st.error(f"Folder '{SAVE_DIR}' missing! 🚨")
+        return []
     except Exception as e:
-        st.error(f"Error scanning {SAVE_DIR}: {e}")
+        st.error(f"Error reading '{SAVE_DIR}': {e}")
         return []
+
     parsed = []
-    for fn in files:
+    for fn in plot_files:
         try:
-            parts = fn[:-4].split('_')  # remove .csv
-            gx = int(parts[1][1:]); gz = int(parts[2][1:])
-            name = ' '.join(parts[3:]) if len(parts)>3 else f"Plot({gx},{gz})"
+            parts = fn[:-4].split('_')  # strip .csv
+            gx = int(parts[1][1:])  # X index
+            gz = int(parts[2][1:])  # Z index
+            name = " ".join(parts[3:]) if len(parts)>3 else f"Plot({gx},{gz})"
             parsed.append({
-                'id': fn[:-4], 'filename': fn,
-                'grid_x': gx, 'grid_z': gz,
+                'id': fn[:-4],
+                'filename': fn,
+                'grid_x': gx,
+                'grid_z': gz,
                 'name': name,
-                'x_offset': gx*PLOT_WIDTH,
-                'z_offset': gz*PLOT_DEPTH
+                'x_offset': gx * PLOT_WIDTH,
+                'z_offset': gz * PLOT_DEPTH
             })
-        except:
-            st.warning(f"Skipping invalid file: {fn}")
+        except Exception:
+            st.warning(f"Skip invalid file: {fn}")
     parsed.sort(key=lambda p: (p['grid_x'], p['grid_z']))
     return parsed
 
 
 def load_plot_objects(filename, x_offset, z_offset):
+    # 📥 Load objects from a plot CSV and shift by offsets
     path = os.path.join(SAVE_DIR, filename)
     try:
         df = pd.read_csv(path)
+        # 🛡️ Ensure essentials exist
         if not all(c in df.columns for c in ['type','pos_x','pos_y','pos_z']):
-            st.warning(f"Missing cols in {filename}")
+            st.warning(f"Missing cols in {filename} 🧐")
             return []
+        # 🆔 Guarantee obj_id
         df['obj_id'] = df.get('obj_id', pd.Series([str(uuid.uuid4()) for _ in df.index]))
+        # 🔄 Fill missing rotation
         for col, default in [('rot_x',0.0),('rot_y',0.0),('rot_z',0.0),('rot_order','XYZ')]:
-            if col not in df.columns: df[col]=default
+            if col not in df.columns:
+                df[col] = default
+
         objs = []
-        for _, r in df.iterrows():
-            o = r.to_dict()
-            o['pos_x'] += x_offset; o['pos_z'] += z_offset
+        for _, row in df.iterrows():
+            o = row.to_dict()
+            o['pos_x'] += x_offset
+            o['pos_z'] += z_offset
             objs.append(o)
         return objs
-    except Exception:
+    except FileNotFoundError:
+        st.error(f"CSV not found: {filename}")
+        return []
+    except pd.errors.EmptyDataError:
+        return []
+    except Exception as e:
+        st.error(f"Load error {filename}: {e}")
         return []
 
 
 def save_plot_data(filename, objects_list, px, pz):
+    # 💾 Save list of new objects relative to plot origin
     path = os.path.join(SAVE_DIR, filename)
     if not isinstance(objects_list, list):
-        st.error("Invalid save data")
+        st.error("👎 Invalid data format for save")
         return False
-    rel=[]
+
+    rel = []
     for o in objects_list:
-        pos=o.get('position',{}); rot=o.get('rotation',{})
-        typ=o.get('type','Unknown'); oid=o.get('obj_id',str(uuid.uuid4()))
-        if not all(k in pos for k in ['x','y','z']) or typ=='Unknown': continue
+        pos = o.get('position', {})
+        rot = o.get('rotation', {})
+        typ = o.get('type','Unknown')
+        oid = o.get('obj_id', str(uuid.uuid4()))
+        # 🛑 Skip bad objects
+        if not all(k in pos for k in ['x','y','z']) or typ=='Unknown':
+            continue
         rel.append({
-            'obj_id':oid,'type':typ,
-            'pos_x':pos['x']-px,'pos_y':pos['y'],'pos_z':pos['z']-pz,
-            'rot_x':rot.get('_x',0.0),'rot_y':rot.get('_y',0.0),'rot_z':rot.get('_z',0.0),'rot_order':rot.get('_order','XYZ')
+            'obj_id': oid, 'type': typ,
+            'pos_x': pos['x']-px, 'pos_y': pos['y'], 'pos_z': pos['z']-pz,
+            'rot_x': rot.get('_x',0.0), 'rot_y': rot.get('_y',0.0),
+            'rot_z': rot.get('_z',0.0), 'rot_order': rot.get('_order','XYZ')
         })
     try:
-        pd.DataFrame(rel,columns=CSV_COLUMNS).to_csv(path,index=False)
-        st.success(f"Saved {len(rel)} to {filename}")
+        pd.DataFrame(rel, columns=CSV_COLUMNS).to_csv(path, index=False)
+        st.success(f"🎉 Saved {len(rel)} to {filename}")
         return True
     except Exception as e:
         st.error(f"Save failed: {e}")
         return False
 
+# 🔒 Singleton for global world state
 @st.cache_resource
 def get_game_state():
-    return GameState(save_dir=SAVE_DIR,csv_filename='world_state.csv')
+    return GameState(save_dir=SAVE_DIR, csv_filename="world_state.csv")
 
-game_state=get_game_state()
+game_state = get_game_state()
 
-# 🧠 Session defaults
+# 🧠 Session state defaults
 st.session_state.setdefault('selected_object','None')
+st.session_state.setdefault('new_plot_name','')
+st.session_state.setdefault('js_save_data_result',None)
 
-# 🔄 Load metadata & objects
-plots_metadata=load_plot_metadata()
-all_initial_objects=[]
+# 🔄 Load everything
+plots_metadata = load_plot_metadata()
+all_initial_objects = []
 for p in plots_metadata:
-    all_initial_objects+=load_plot_objects(p['filename'],p['x_offset'],p['z_offset'])
+    all_initial_objects += load_plot_objects(p['filename'], p['x_offset'], p['z_offset'])
 
-# 🖥️ Sidebar UI\ with kits
+# 🖥️ Sidebar UI
 with st.sidebar:
     st.title("🏗️ World Controls")
-    st.header("🌟 Place Kits")
-    options=["None"]+list(kits.keys())
-    idx=options.index(st.session_state.selected_object) if st.session_state.selected_object in options else 0
-    sel=st.selectbox("Select Kit:",options,index=idx,key="selected_object_widget")
-    if sel!=st.session_state.selected_object:
-        st.session_state.selected_object=sel
+    st.header("📍 Navigate Plots")
+    cols = st.columns(2)
+    i = 0
+    for p in sorted(plots_metadata, key=lambda x:(x['grid_x'],x['grid_z'])):
+        label = f"➡️ {p['name']} ({p['grid_x']},{p['grid_z']})"
+        if cols[i].button(label, key=f"nav_{p['id']}"):
+            try:
+                from streamlit_js_eval import streamlit_js_eval
+                js = f"teleportPlayer({p['x_offset']+PLOT_WIDTH/2},{p['z_offset']+PLOT_DEPTH/2});"
+                streamlit_js_eval(js_code=js, key=f"tp_{p['id']}")
+            except Exception as e:
+                st.error(f"TP fail: {e}")
+        i = (i+1)%2
+
+    st.markdown("---")
+    st.header("🌲 Place Objects")
+    opts = ["None","Simple House","Tree","Rock","Fence Post"]
+    idx = opts.index(st.session_state.selected_object) if st.session_state.selected_object in opts else 0
+    sel = st.selectbox("Select:", opts, index=idx, key="selected_object_widget")
+    if sel != st.session_state.selected_object:
+        st.session_state.selected_object = sel
+
     st.markdown("---")
     st.header("💾 Save Work")
-    if st.button("💾 Save Current Work"):
+    if st.button("💾 Save Current Work", key="save_button"):
         from streamlit_js_eval import streamlit_js_eval
-        streamlit_js_eval(js_code="getSaveDataAndPosition();",key="js_save_processor")
+        streamlit_js_eval(js_code="getSaveDataAndPosition();", key="js_save_processor")
         st.rerun()
 
-# 🏠 Main area
+# 📨 Handle incoming save data
+raw = st.session_state.get("js_save_processor")
+if raw:
+    st.info("📬 Got save data!")
+    ok=False
+    try:
+        pay = json.loads(raw) if isinstance(raw,str) else raw
+        pos, objs = pay.get('playerPosition'), pay.get('objectsToSave')
+        if isinstance(objs,list) and pos:
+            gx, gz = math.floor(pos['x']/PLOT_WIDTH), math.floor(pos['z']/PLOT_DEPTH)
+            fn = f"plot_X{gx}_Z{gz}.csv"
+            if save_plot_data(fn, objs, gx*PLOT_WIDTH, gz*PLOT_DEPTH):
+                load_plot_metadata.clear()
+                try:
+                    from streamlit_js_eval import streamlit_js_eval
+                    streamlit_js_eval(js_code="resetNewlyPlacedObjects();", key="reset_js")
+                except:
+                    pass
+                game_state.update_state(objs)
+                ok=True
+        if not ok:
+            st.error("❌ Save error")
+    except Exception as e:
+        st.error(f"Err: {e}")
+    st.session_state.js_save_processor=None
+    if ok: st.rerun()
+
+# 🏠 Main view
 st.header("🌍 Infinite Shared 3D World")
-st.caption("Click to explore & place kits, then 💾 to save!")
+st.caption("➡️ Explore, click to build, 💾 to save!")
 
 # 🔌 Inject state into JS
-injected_state={
-    "ALL_INITIAL_OBJECTS":all_initial_objects,
-    "PLOTS_METADATA":plots_metadata,
-    "SELECTED_OBJECT_TYPE":st.session_state.selected_object,
-    "PLOT_WIDTH":PLOT_WIDTH,
-    "PLOT_DEPTH":PLOT_DEPTH,
-    "GAME_STATE":game_state.get_state(),
-    "KITS":kits
+state = {
+    "ALL_INITIAL_OBJECTS": all_initial_objects,
+    "PLOTS_METADATA": plots_metadata,
+    "SELECTED_OBJECT_TYPE": st.session_state.selected_object,
+    "PLOT_WIDTH": PLOT_WIDTH,
+    "PLOT_DEPTH": PLOT_DEPTH,
+    "GAME_STATE": game_state.get_state()
 }
 
 try:
-    html=open('index.html','r',encoding='utf-8').read()
-    script=f"""
+    with open('index.html','r',encoding='utf-8') as f:
+        html = f.read()
+    script = f"""
 <script>
-window.ALL_INITIAL_OBJECTS={json.dumps(injected_state['ALL_INITIAL_OBJECTS'])};
-window.PLOTS_METADATA={json.dumps(injected_state['PLOTS_METADATA'])};
-window.SELECTED_OBJECT_TYPE={json.dumps(injected_state['SELECTED_OBJECT_TYPE'])};
-window.PLOT_WIDTH={json.dumps(injected_state['PLOT_WIDTH'])};
-window.PLOT_DEPTH={json.dumps(injected_state['PLOT_DEPTH'])};
-window.GAME_STATE={json.dumps(injected_state['GAME_STATE'])};
-window.KITS={json.dumps(injected_state['KITS'])};
-console.log('State injected',{{objs:window.ALL_INITIAL_OBJECTS.length,plots:window.PLOTS_METADATA.length, kits:Object.keys(window.KITS).length}});
+    window.ALL_INITIAL_OBJECTS = {json.dumps(state['ALL_INITIAL_OBJECTS'])};
+    window.PLOTS_METADATA   = {json.dumps(state['PLOTS_METADATA'])};
+    window.SELECTED_OBJECT_TYPE = {json.dumps(state['SELECTED_OBJECT_TYPE'])};
+    window.PLOT_WIDTH = {json.dumps(state['PLOT_WIDTH'])};
+    window.PLOT_DEPTH = {json.dumps(state['PLOT_DEPTH'])};
+    window.GAME_STATE = {json.dumps(state['GAME_STATE'])};
+    console.log('👍 State injected!', {{
+        objs: window.ALL_INITIAL_OBJECTS.length,
+        plots: window.PLOTS_METADATA.length,
+        gs: window.GAME_STATE.length
+    }});
 </script>
 """
-    html_mod=html.replace('</head>',script+'\n</head>',1)
-    components.html(html_mod,height=750,scrolling=False)
+    html = html.replace('</head>', script + '\n</head>', 1)
+    components.html(html, height=750, scrolling=False)
 except FileNotFoundError:
-    st.error("index.html missing!")
+    st.error("❌ index.html missing!")
 except Exception as e:
-    st.error(f"HTML inject error: {e}")
+    st.error(f"😱 HTML inject failed: {e}")