Restructure project

Author: StrongMods

.github/workflows/release.yml

@@ -14,22 +14,25 @@ jobs:
       uses: actions/checkout@v2
 
     - name: Set up build environment
+      working-directory: ./strongmod
       run: make setup-environment
 
     - name: Download and unzip python
+      working-directory: ./strongmod
       run: make download-and-unzip-cpython
 
     - name: Compile project
+      working-directory: ./strongmod
       run: make
 
-    - uses: montudor/action-zip@v1
-      with:
-        args: zip -qq -r strongmod.zip ./
+    - name: Zip project
+      working-directory: ./strongmod
+      run: make zip-project
 
     - uses: "marvinpinto/action-automatic-releases@latest"
       with:
         repo_token: "${{ secrets.GITHUB_TOKEN }}"
         prerelease: false
         files: |
-          ./strongmod.zip
+          ./strongmod/strongmod.zip
           

.gitignore

@@ -50,5 +50,6 @@
 /build/
 /game_controller.dll
 game_controller.o
-/docs/build/
-/strongmod/version.py
+/strongmod/docs/build/
+/strongmod/strongmod/version.py
+/strongmod/cpython

start_game.bat

@@ -1 +1,5 @@
-start "" ".\python.exe" .\strongmod\start_game.py
+setlocal
+
+.\strongmod\cpython\python.exe .\strongmod\strongmod\start_game.py
+
+endlocal

strongmod/__init__.py

@@ -1,2 +0,0 @@
-import sys
-sys.path.append('strongmod')

docs/.nojekyll renamed to strongmod/docs/.nojekyll

@@ -23,12 +23,16 @@ strongmod/version.py:
 
 setup-environment:
 	sudo apt-get update
-	sudo apt-get install -y gcc-mingw-w64-i686 unzip
+	sudo apt-get install -y gcc-mingw-w64-i686 unzip zip
 
 download-and-unzip-cpython:
-	wget https://www.python.org/ftp/python/3.8.10/python-3.8.10-embed-win32.zip
-	unzip -n python-3.8.10-embed-win32.zip
-	rm python-3.8.10-embed-win32.zip
+	mkdir -p cpython
+	wget https://www.python.org/ftp/python/3.8.10/python-3.8.10-embed-win32.zip -O cpython/python-3.8.10-embed-win32.zip
+	unzip -n cpython/python-3.8.10-embed-win32.zip -d cpython/
+	rm cpython/python-3.8.10-embed-win32.zip
+
+zip-project:
+	cd .. && zip -r ./strongmod/strongmod.zip ./strongmod ./start_game.bat
 
 .PHONY: strongmod/version.py
 

docs/Makefile renamed to strongmod/docs/Makefile

@@ -7,7 +7,7 @@
 
 load_image = ui.load_image
 
-images_path = "./mods/auto_market/images"
+images_path = "./strongmod/mods/auto_market/images"
 
 load_images = ui.load_images
 

docs/make.bat renamed to strongmod/docs/make.bat

@@ -0,0 +1,4 @@
+import os
+import sys
+sys.path.insert(0, os.path.abspath('./strongmod/strongmod'))
+

docs/source/api.rst renamed to strongmod/docs/source/api.rst

@@ -336,12 +336,9 @@ def count_metal_armor(self):
         return count_metal_armor(self.lord_id)
 
     def count_good(self, good_type: GoodType) -> int:
-        """
-        Get the amount of a specific type of good owned by the lord.
-
+        """Get the amount of a specific type of good owned by the lord.
         :param good_type: The type of the good.
         :type good_type: GoodType
-
         :return: The amount of the specified good.
         :rtype int
         """

docs/source/conf.py renamed to strongmod/docs/source/conf.py

@@ -7,7 +7,7 @@
 from internal.mod_repository import ModRepository, DirectoryManager
 from common.file_system import FileSystem
 
-_game_controller = CDLL("game_controller.dll")
+_game_controller = CDLL("./strongmod/game_controller.dll")
 
 entry = 0x0584026
 t = Thread(target=CFUNCTYPE(c_void_p)(entry))
@@ -24,5 +24,5 @@ def handle_ui_tick_event():
 file_manager = FileSystem()
 
 
-ModLoader(ModRepository("./mods", directory_manager, file_manager)).load_mods()
+ModLoader(ModRepository("./strongmod/mods", directory_manager, file_manager)).load_mods()
 t.join()

docs/source/index.rst renamed to strongmod/docs/source/index.rst

@@ -3,4 +3,4 @@
 
 class GameControllerMaker:
     def make_game_controller(self):
-        return CDLL("./game_controller.dll")
+        return CDLL("./strongmod/game_controller.dll")

game_controller.c renamed to strongmod/game_controller.c

@@ -1,7 +1,9 @@
 import ctypes
+import os
 import sys
 
-sys.path.append('strongmod')
+# sys.path.append('strongmod/strongmod')
+sys.path.insert(0, os.path.abspath('./strongmod/strongmod'))
 
 from pymem import Pymem
 
@@ -64,4 +66,4 @@ def create_suspended_process(command_line):
 process = Pymem(process_id)
 process.inject_python_interpreter()
 
-process.inject_python_shellcode("import strongmod.init")
+process.inject_python_shellcode("import sys;import os;sys.path.insert(0, os.path.abspath('./strongmod'));import strongmod.init")