saving sapling and fense inclosures

Author: gcclinux

src/main/java/wagemaker/uk/gdx/MyGdxGame.java

@@ -272,6 +272,12 @@ public enum GameMode {
     static final int CAMERA_WIDTH = 1280;
     static final int CAMERA_HEIGHT = 1024;
 
+    public FenceBuildingManager getFenceBuildingManager() {
+        return fenceBuildingManager;
+    }
+
+
+
     @Override
     public void create() {
         // Initialize localization system first (before any UI components)
@@ -2436,13 +2442,24 @@ private void clearLocalWorld() {
             plantedBamboos.clear();
 
             // Clear cleared positions map
-            clearedPositions.clear();
-            
-            long duration = System.currentTimeMillis() - startTime;
-            System.out.println("Local world cleared successfully in " + duration + "ms");
-            System.out.println("Cleared planted trees and bamboos to prevent singleplayer items in multiplayer");
-            
-        } catch (Exception e) {
+        clearedPositions.clear();
+        
+        // CRITICAL FIX: Clear fence structures to prevent singleplayer fences in multiplayer
+        if (fenceBuildingManager != null) {
+            try {
+                fenceBuildingManager.getStructureManager().clear();
+                fenceBuildingManager.rebuildCollisionBoundaries();
+                System.out.println("Cleared fence structures for multiplayer");
+            } catch (Exception e) {
+                System.err.println("Error clearing fence structures: " + e.getMessage());
+            }
+        }
+        
+        long duration = System.currentTimeMillis() - startTime;
+        System.out.println("Local world cleared successfully in " + duration + "ms");
+        System.out.println("Cleared planted trees and bamboos to prevent singleplayer items in multiplayer");
+        
+    } catch (Exception e) {
             System.err.println("Error clearing local world: " + e.getMessage());
             e.printStackTrace();
             // Continue anyway - server state will override
@@ -3649,6 +3666,24 @@ public boolean restoreWorldState(WorldSaveData saveData) {
                 }
             }
 
+            // Restore fence structures from world save
+            if (saveData.getFenceStructures() != null && !saveData.getFenceStructures().isEmpty() && fenceBuildingManager != null) {
+                try {
+                    int restoredCount = wagemaker.uk.fence.FencePersistenceManager.deserializeFenceStructures(
+                        saveData.getFenceStructures(), 
+                        fenceBuildingManager.getStructureManager()
+                    );
+                    
+                    // Rebuild collision boundaries after restoration
+                    fenceBuildingManager.rebuildCollisionBoundaries();
+                    
+                    System.out.println("Restored " + restoredCount + " fence structures from world save");
+                } catch (Exception e) {
+                    System.err.println("Error restoring fence structures: " + e.getMessage());
+                    e.printStackTrace();
+                }
+            }
+            
             System.out.println("World state restoration completed successfully");
             return true;
 
@@ -3755,6 +3790,17 @@ private void cleanupExistingWorldState() {
             // Clear cleared positions
             clearedPositions.clear();
 
+            // Clear fence structures
+            if (fenceBuildingManager != null) {
+                try {
+                    fenceBuildingManager.getStructureManager().clear();
+                    fenceBuildingManager.rebuildCollisionBoundaries();
+                    System.out.println("Cleared fence structures during world cleanup");
+                } catch (Exception e) {
+                    System.err.println("Error clearing fence structures: " + e.getMessage());
+                }
+            }
+                        
             System.out.println("Existing world state cleaned up successfully");
 
         } catch (Exception e) {

src/main/java/wagemaker/uk/ui/GameMenu.java

@@ -1649,14 +1649,24 @@ private void performWorldSave(String saveName) {
                 }
             }
 
+            // Get fence and respawn managers from game instance
+            wagemaker.uk.fence.FenceStructureManager fenceManager = null;
+            if (gameInstance.getFenceBuildingManager() != null) {
+                fenceManager = gameInstance.getFenceBuildingManager().getStructureManager();
+            }
+
+            wagemaker.uk.respawn.RespawnManager respawnManager = gameInstance.getRespawnManager();
+            
             boolean success = WorldSaveManager.saveWorld(
                 saveName, 
                 currentWorldState,
                 saveX, 
                 saveY, 
                 saveHealth,
                 currentInventory,
-                isMultiplayer
+                isMultiplayer,
+                respawnManager,
+                fenceManager
             );
 
             if (success) {

src/main/java/wagemaker/uk/world/WorldSaveManager.java

@@ -286,6 +286,16 @@ public static boolean saveWorld(String saveName, WorldState worldState,
                 saveData.setPlantedBamboos(worldState.getPlantedBamboos());
                 System.out.println("Saved " + worldState.getPlantedBamboos().size() + " planted bamboos");
             }
+
+            if (worldState.getPlantedBananaTrees() != null) {
+                saveData.setPlantedBananaTrees(worldState.getPlantedBananaTrees());
+                System.out.println("Saved " + worldState.getPlantedBananaTrees().size() + " planted banana trees");
+            }
+
+            if (worldState.getPlantedAppleTrees() != null) {
+                saveData.setPlantedAppleTrees(worldState.getPlantedAppleTrees());
+                System.out.println("Saved " + worldState.getPlantedAppleTrees().size() + " planted apple trees");
+            }
 
             // Set respawn data if provided
             if (respawnManager != null) {