From af7a4f0a8020bcb8f98375eb4582112543fc2a36 Mon Sep 17 00:00:00 2001
From: Nick Dyer <nickedyer@gmail.com>
Date: Sat, 29 May 2021 21:42:33 -0400
Subject: [PATCH] changed some imports, blanked out all __init__.py files

---
 .gitignore                                |  6 ++---
 pocket_friends/__init__.py                |  1 -
 pocket_friends/__main__.py                | 30 +++++++++--------------
 pocket_friends/development/__init__.py    |  1 -
 pocket_friends/development/button_test.py |  2 +-
 pocket_friends/development/dev_menu.py    |  2 +-
 pocket_friends/game_files/game.py         |  4 +--
 7 files changed, 19 insertions(+), 27 deletions(-)

diff --git a/.gitignore b/.gitignore
index f21358b..2fa2403 100644
--- a/.gitignore
+++ b/.gitignore
@@ -128,8 +128,8 @@ dmypy.json
 # Pyre type checker
 .pyre/
 
-# Save file
-/save.json
-
 # pocket-friends compile script
 /compile.bat
+
+# save file
+/pocket_friends/save.json
diff --git a/pocket_friends/__init__.py b/pocket_friends/__init__.py
index 498af1e..e69de29 100644
--- a/pocket_friends/__init__.py
+++ b/pocket_friends/__init__.py
@@ -1 +0,0 @@
-"""Imports classes for running the hardware."""
diff --git a/pocket_friends/__main__.py b/pocket_friends/__main__.py
index 387d89b..8c2d29f 100644
--- a/pocket_friends/__main__.py
+++ b/pocket_friends/__main__.py
@@ -7,25 +7,19 @@ from pocket_friends.game_files.game import main as game_main
 from pocket_friends.development.dev_menu import main as dev_menu_main
 
 
-def main():
+if __name__ == "__main__":
     enable_dev = False
 
-    if __name__ == '__main__':
+    # enable dev mode if --dev argument is passed
+    if len(sys.argv) > 0:
+        for args in sys.argv:
+            if args == '--dev':
+                enable_dev = True
 
-        # enable dev mode if --dev argument is passed
-        if len(sys.argv) > 0:
-            for args in sys.argv:
-                if args == '--dev':
-                    enable_dev = True
+    if not enable_dev:
+        game_main()
+    else:
+        dev_menu_main()
 
-        if not enable_dev:
-            game_main()
-        else:
-            dev_menu_main()
-
-        pygame.quit()
-        sys.exit()
-
-
-if __name__ == "__main__":
-    main()
+    pygame.quit()
+    sys.exit()
diff --git a/pocket_friends/development/__init__.py b/pocket_friends/development/__init__.py
index 2b19ec2..e69de29 100644
--- a/pocket_friends/development/__init__.py
+++ b/pocket_friends/development/__init__.py
@@ -1 +0,0 @@
-"""Initializes all classes needed for the development environment, and faking GPIO inputs."""
diff --git a/pocket_friends/development/button_test.py b/pocket_friends/development/button_test.py
index 159627b..f9c7ee5 100644
--- a/pocket_friends/development/button_test.py
+++ b/pocket_friends/development/button_test.py
@@ -2,7 +2,7 @@
 Module to test the GPIO input on the Raspberry Pi.
 """
 from collections import deque
-from pocket_friends.hardware.gpio_handler import Constants, GPIOHandler
+from ..hardware.gpio_handler import Constants, GPIOHandler
 
 
 def button_test():
diff --git a/pocket_friends/development/dev_menu.py b/pocket_friends/development/dev_menu.py
index 8f638d7..10911d2 100644
--- a/pocket_friends/development/dev_menu.py
+++ b/pocket_friends/development/dev_menu.py
@@ -8,7 +8,7 @@ import pygame
 import time
 from .button_test import button_test
 from .menus import Menu
-from pocket_friends.hardware.gpio_handler import GPIOHandler, Constants
+from ..hardware.gpio_handler import GPIOHandler, Constants
 
 dev_version = '0.0.1'
 
diff --git a/pocket_friends/game_files/game.py b/pocket_friends/game_files/game.py
index a897ad7..b5713ea 100644
--- a/pocket_friends/game_files/game.py
+++ b/pocket_friends/game_files/game.py
@@ -7,7 +7,7 @@ import json
 import os
 import pygame
 from pygame.locals import *
-from pocket_friends.hardware.gpio_handler import Constants, GPIOHandler
+from ..hardware.gpio_handler import Constants, GPIOHandler
 
 version = '0.0.1'
 game_fps = 16
@@ -33,7 +33,7 @@ class FileHandler:
         """
         Writes attributes of class to "save.json" file.
         """
-        with open('save.json', 'w') as save_file:
+        with open('pocket_friends/save.json', 'w') as save_file:
             json.dump(self.attributes, save_file)
             save_file.close()