Updated folder hierarchy and save and restore

src/com/droidquest/DQ.java

@@ -11,6 +11,8 @@ import java.awt.*;
 import java.awt.event.*;
 import java.util.Set;
 
+import java.io.*;
+
 public class DQ extends JFrame implements ActionListener {
     private RoomDisplay myRoom;
 
@@ -276,7 +278,6 @@ public class DQ extends JFrame implements ActionListener {
         }
     }
 
-
     public void actionPerformed(ActionEvent e) {
         if (e.getActionCommand().equals("Save Level")) {
             FileDialog fd = new FileDialog(this, "Save Level", FileDialog.SAVE);

src/com/droidquest/avatars/Player.java

@@ -136,8 +136,8 @@ public class Player extends Item implements Avatar {
                         + fd.getFile());
                 if (fd.getFile() != null) {
                     ((SmallChip) carrying).Empty();
-                    //((SmallChip) carrying).LoadChip(fd.getDirectory() + fd.getFile());
-                    ((SmallChip) carrying).LoadChip(fd.getFile(), false);
+                    ((SmallChip) carrying).LoadChip(fd.getDirectory() + fd.getFile(), false);
+                    //((SmallChip) carrying).LoadChip(fd.getFile(), false);
                 }
                 return true;
             }

src/com/droidquest/devices/SmallChip.java

@@ -239,111 +239,7 @@ public class SmallChip extends GenericChip {
 			File file;
 			InputStream link;
 
-			if (!gameChip) {
-				filename = System.getProperty("user.home") + "/.DroidQuest/chips/" + filename;
-
-				/* Create default chips for user */
-				file = new File(System.getProperty("user.home") + "/.DroidQuest/chips/");
-				if (!file.exists()) {
-					file.mkdirs();
-					file = new File(System.getProperty("user.home") + "/.DroidQuest/chips/CountToN.chip");
-					if (!file.exists()) {
-						link = getClass().getResourceAsStream("/chips/CountToN.chip");
-						Files.copy(link, file.getAbsoluteFile().toPath());
-					}
-					file = new File(System.getProperty("user.home") + "/.DroidQuest/chips/gates.chip");
-					if (!file.exists()) {
-						link = getClass().getResourceAsStream("/chips/gates.chip");
-						Files.copy(link, file.getAbsoluteFile().toPath());
-					}
-					file = new File(System.getProperty("user.home") + "/.DroidQuest/chips/oscillator.chip");
-					if (!file.exists()) {
-						link = getClass().getResourceAsStream("/chips/oscillator.chip");
-						Files.copy(link, file.getAbsoluteFile().toPath());
-					}
-					file = new File(System.getProperty("user.home") + "/.DroidQuest/chips/WallHugger.chip");
-					if (!file.exists()) {
-						link = getClass().getResourceAsStream("/chips/WallHugger.chip");
-						Files.copy(link, file.getAbsoluteFile().toPath());
-					}
-					file = new File(System.getProperty("user.home") + "/.DroidQuest/chips/4NodeL2R.chip");
-					if (!file.exists()) {
-						link = getClass().getResourceAsStream("/chips/4NodeL2R.chip");
-						Files.copy(link, file.getAbsoluteFile().toPath());
-					}
-					file = new File(System.getProperty("user.home") + "/.DroidQuest/chips/4NodeR2L.chip");
-					if (!file.exists()) {
-						link = getClass().getResourceAsStream("/chips/4NodeR2L.chip");
-						Files.copy(link, file.getAbsoluteFile().toPath());
-					}
-					file = new File(System.getProperty("user.home") + "/.DroidQuest/chips/4ORL2R.chip");
-					if (!file.exists()) {
-						link = getClass().getResourceAsStream("/chips/4ORL2R.chip");
-						Files.copy(link, file.getAbsoluteFile().toPath());
-					}
-					file = new File(System.getProperty("user.home") + "/.DroidQuest/chips/4ORR2L.chip");
-					if (!file.exists()) {
-						link = getClass().getResourceAsStream("/chips/4ORR2L.chip");
-						Files.copy(link, file.getAbsoluteFile().toPath());
-					}
-					file = new File(System.getProperty("user.home") + "/.DroidQuest/chips/6BitCounter.chip");
-					if (!file.exists()) {
-						link = getClass().getResourceAsStream("/chips/6BitCounter.chip");
-						Files.copy(link, file.getAbsoluteFile().toPath());
-					}
-					file = new File(System.getProperty("user.home") + "/.DroidQuest/chips/Bus.chip");
-					if (!file.exists()) {
-						link = getClass().getResourceAsStream("/chips/Bus.chip");
-						Files.copy(link, file.getAbsoluteFile().toPath());
-					}
-					file = new File(System.getProperty("user.home") + "/.DroidQuest/chips/Clock.chip");
-					if (!file.exists()) {
-						link = getClass().getResourceAsStream("/chips/Clock.chip");
-						Files.copy(link, file.getAbsoluteFile().toPath());
-					}
-					file = new File(System.getProperty("user.home") + "/.DroidQuest/chips/Delay.chip");
-					if (!file.exists()) {
-						link = getClass().getResourceAsStream("/chips/Delay.chip");
-						Files.copy(link, file.getAbsoluteFile().toPath());
-					}
-					file = new File(System.getProperty("user.home") + "/.DroidQuest/chips/FullAdder.chip");
-					if (!file.exists()) {
-						link = getClass().getResourceAsStream("/chips/FullAdder.chip");
-						Files.copy(link, file.getAbsoluteFile().toPath());
-					}
-					file = new File(System.getProperty("user.home") + "/.DroidQuest/chips/Monomer.chip");
-					if (!file.exists()) {
-						link = getClass().getResourceAsStream("/chips/Monomer.chip");
-						Files.copy(link, file.getAbsoluteFile().toPath());
-					}
-					file = new File(System.getProperty("user.home") + "/.DroidQuest/chips/old_WallHugger.chip");
-					if (!file.exists()) {
-						link = getClass().getResourceAsStream("/chips/old_WallHugger.chip");
-						Files.copy(link, file.getAbsoluteFile().toPath());
-					}
-					file = new File(System.getProperty("user.home") + "/.DroidQuest/chips/OneShot.chip");
-					if (!file.exists()) {
-						link = getClass().getResourceAsStream("/chips/OneShot.chip");
-						Files.copy(link, file.getAbsoluteFile().toPath());
-					}
-					file = new File(System.getProperty("user.home") + "/.DroidQuest/chips/quarter.chip");
-					if (!file.exists()) {
-						link = getClass().getResourceAsStream("/chips/quarter.chip");
-						Files.copy(link, file.getAbsoluteFile().toPath());
-					}
-					file = new File(System.getProperty("user.home") + "/.DroidQuest/chips/RSflipflop.chip");
-					if (!file.exists()) {
-						link = getClass().getResourceAsStream("/chips/RSflipflop.chip");
-						Files.copy(link, file.getAbsoluteFile().toPath());
-					}
-					file = new File(System.getProperty("user.home") + "/.DroidQuest/chips/Token.chip");
-					if (!file.exists()) {
-						link = getClass().getResourceAsStream("/chips/Token.chip");
-						Files.copy(link, file.getAbsoluteFile().toPath());
-					}
-				}
-			}
-			else {
+			if (gameChip) {
 				filename = "/usr/share/DroidQuest/chips/" + filename;
 			}
 

src/com/droidquest/levels/MainMenu.java

@@ -267,7 +267,7 @@ public class MainMenu extends Level {
         player = gameCursor;
         currentViewer = player;
 
-        File f = new File(System.getProperty("user.home") + "/.DroidQuest/" + "ROlevels/");
+        File f = new File(System.getProperty("user.home") + "/.DroidQuest/ROlevels/");
         if (!f.exists()) {
             f.mkdir();
         }