diff --git a/.github/workflows/docs_pages.yml b/.github/workflows/docs_pages.yml index b07b9fc..a28989d 100644 --- a/.github/workflows/docs_pages.yml +++ b/.github/workflows/docs_pages.yml @@ -19,4 +19,5 @@ jobs: pip install mkdocs-material pip install mkdocs-callouts pip install mkdocs-glightbox + cd python/ mkdocs gh-deploy --force \ No newline at end of file diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 338fac6..ebc5e4a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -10,6 +10,8 @@ jobs: outputs: assets_url: ${{ steps.create-release.outputs.upload_url }} steps: + - name: Checkout + uses: actions/checkout@v4 - name: Create release id: create-release uses: actions/create-release@v1 @@ -17,7 +19,8 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: tag_name: ${{ github.run_number }} - release_name: Release 1 + release_name: Release Title + body_path: CHANGELOG.md draft: true release-win64: runs-on: windows-latest @@ -44,7 +47,7 @@ jobs: - name: CMake - Build run: cmake --build --preset Windows-x64-Release - name: Archive output files - run: Compress-Archive -Path "g2o", "out/build/Windows-x64-Release/PyG2O.x64.dll" -Destination Windows-x64-Release.zip + run: Compress-Archive -Path "python/g2o", "build/Windows-x64-Release/source/PyG2O.x64.dll" -Destination Windows-x64-Release.zip - name: Upload release uses: actions/upload-release-asset@v1 env: @@ -77,7 +80,7 @@ jobs: - name: Archive files uses: montudor/action-zip@v1 with: - args: zip -r Linux-x64-Release.zip g2o out/build/Linux-x64-Release/PyG2O.x64.so + args: zip -r Linux-x64-Release.zip python/g2o build/Linux-x64-Release/source/PyG2O.x64.so - name: Upload release uses: actions/upload-release-asset@v1 env: diff --git a/.gitignore b/.gitignore index 4f5e8fc..74850c8 100644 --- a/.gitignore +++ b/.gitignore @@ -13,4 +13,5 @@ desktop.ini # VS Code -/.vscode/ \ No newline at end of file +/.vscode/ +/source/.vscode/ \ No newline at end of file diff --git a/.gitmodules b/.gitmodules index 929053e..f6f44fd 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,8 +1,6 @@ -[submodule "sqapi"] +[submodule "source/dependencies/sqapi"] path = source/dependencies/sqapi url = https://gitlab.com/GothicMultiplayerTeam/dependencies/sqapi.git - branch = main -[submodule "pybind11"] +[submodule "source/dependencies/pybind11"] path = source/dependencies/pybind11 url = https://github.com/pybind/pybind11.git - branch = master \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 132c5ca..88a591a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,13 @@ ## Changelog -- Release configuration will now be used for windows & linux builds \ No newline at end of file +- Updated project structure and CMake settings (read more at build specific changes) +- Revised unpredicted behavior ``All player getters on both sides will now return null if player isn't created/spawned``: these getters should return an empty string if player isn't created/spawned + +### Build specific changes + +- Project has been split into separate logical directories (docs, python, build, source) +- Added LICENSE (usual free software license) +- CMake config was split to logical files for better readabilty +- Added README.md and LICENSE for NoNut directory +- Removed unused toolchain files and build presets +- Added short ``How to build`` section to README.md \ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt index 29847d9..f848768 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,52 +1,8 @@ cmake_minimum_required(VERSION 3.21) -include(${CMAKE_ROOT}/Modules/ExternalProject.cmake) -project(PyG2O) - set(CMAKE_CXX_STANDARD 20) set(CMAKE_CXX_STANDARD_REQUIRED TRUE) -file(GLOB_RECURSE SOURCE - "include/*.h" - - "src/NoNut/core/*.h" - "src/NoNut/core/*.cpp" - "src/classes/*.h" - "src/classes/*.cpp" - "src/classes/sq/*.h" - "src/classes/sq/*.cpp" - "src/classes/py/*.h" - "src/classes/py/*.cpp" - "src/constants/*.h" - "src/constants/*.cpp" - "src/functions/*.h" - "src/functions/*.cpp" - "src/*.h" - "src/*.cpp" - "src/events/*.h" - "src/events/*.cpp" -) +project(PyG2O VERSION 1.3.1.0) +set(PYG2O_MODULE_NAME PyG2O) -add_library(${PROJECT_NAME} SHARED ${SOURCE}) - -target_compile_definitions(${PROJECT_NAME} - PRIVATE - SCRAT_EXPORT -) - -target_include_directories(${PROJECT_NAME} - INTERFACE - "include/" - PRIVATE - "src/" -) - -if(DEFINED OUT_FILE_SUFFIX) - set_target_properties(${PROJECT_NAME} - PROPERTIES - PREFIX "" - SUFFIX ".${OUT_FILE_SUFFIX}${CMAKE_SHARED_LIBRARY_SUFFIX}" - ) -endif() - -add_subdirectory(dependencies) -target_link_libraries(${PROJECT_NAME} PRIVATE pybind11::embed) \ No newline at end of file +add_subdirectory(source) \ No newline at end of file diff --git a/CMakePresets.json b/CMakePresets.json index b7a53aa..ebb9832 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -5,7 +5,7 @@ "name": "windows", "hidden": true, "generator": "Ninja", - "binaryDir": "${sourceDir}/out/build/${presetName}", + "binaryDir": "${sourceDir}/build/${presetName}", "condition": { "type": "equals", "lhs": "${hostSystemName}", @@ -20,7 +20,7 @@ "name": "linux", "hidden": true, "generator": "Unix Makefiles", - "binaryDir": "${sourceDir}/out/build/${presetName}", + "binaryDir": "${sourceDir}/build/${presetName}", "condition": { "type": "equals", "lhs": "${hostSystemName}", @@ -30,17 +30,6 @@ "CMAKE_CXX_FLAGS": "-static-libgcc -static-libstdc++" } }, - { - "name": "x86", - "hidden": true, - "architecture": { - "value": "x86", - "strategy": "external" - }, - "cacheVariables": { - "OUT_FILE_SUFFIX": "x86" - } - }, { "name": "x64", "hidden": true, @@ -52,17 +41,6 @@ "OUT_FILE_SUFFIX": "x64" } }, - { - "name": "arm", - "hidden": true, - "architecture": { - "value": "arm", - "strategy": "external" - }, - "cacheVariables": { - "OUT_FILE_SUFFIX": "arm" - } - }, { "name": "arm64", "hidden": true, @@ -89,26 +67,18 @@ } }, - { "name": "Windows-x86-Debug", "inherits": ["windows", "x86", "debug"] }, - { "name": "Windows-x86-Release", "inherits": ["windows", "x86", "release"] }, { "name": "Windows-x64-Debug", "inherits": ["windows", "x64", "debug"] }, { "name": "Windows-x64-Release", "inherits": ["windows", "x64", "release"] }, { "name": "Linux-x64-Debug", "inherits": ["linux", "x64", "debug"] }, { "name": "Linux-x64-Release", "inherits": ["linux", "x64", "release"] }, - { "name": "Linux-arm-Debug", "inherits": ["linux", "arm", "debug"] }, - { "name": "Linux-arm-Release", "inherits": ["linux", "arm", "release"] }, { "name": "Linux-arm64-Debug", "inherits": ["linux", "arm64", "debug"] }, { "name": "Linux-arm64-Release", "inherits": ["linux", "arm64", "release"] } ], "buildPresets": [ - { "name": "Windows-x86-Debug", "configurePreset": "Windows-x86-Debug" }, - { "name": "Windows-x86-Release", "configurePreset": "Windows-x86-Release" }, { "name": "Windows-x64-Debug", "configurePreset": "Windows-x64-Debug" }, { "name": "Windows-x64-Release", "configurePreset": "Windows-x64-Release" }, { "name": "Linux-x64-Debug", "configurePreset": "Linux-x64-Debug" }, { "name": "Linux-x64-Release", "configurePreset": "Linux-x64-Release" }, - { "name": "Linux-arm-Debug", "configurePreset": "Linux-arm-Debug" }, - { "name": "Linux-arm-Release", "configurePreset": "Linux-arm-Release" }, { "name": "Linux-arm64-Debug", "configurePreset": "Linux-arm64-Debug" }, { "name": "Linux-arm64-Release", "configurePreset": "Linux-arm64-Release" } ] diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..7135042 --- /dev/null +++ b/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) AURUMVORAX + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. \ No newline at end of file diff --git a/README.md b/README.md index 1a4c285..cff5f17 100644 --- a/README.md +++ b/README.md @@ -4,6 +4,17 @@ Python support for server-side scripts in [Gothic 2 Online](https://gothic-onlin **Documentation:** https://aurumvorxx.github.io/PyG2O/ +## How to build + +Requirements: +- Python 3.13 +- CMake + +Steps: +1. Copy this repo to your local machine +2. Initialize all submodules +3. Build with CMake, selecting your desired preset (Release/Debug) and target PyG2O +4. (Optional) Uncomment and edit block of code at ``source/CMakeLists.txt`` for auto copy testing files ## Credits diff --git a/dependencies/CMakeLists.txt b/dependencies/CMakeLists.txt deleted file mode 100644 index 41cabd2..0000000 --- a/dependencies/CMakeLists.txt +++ /dev/null @@ -1,7 +0,0 @@ -add_subdirectory(sqapi) -add_subdirectory(pybind11) - -target_link_libraries(${PROJECT_NAME} - PRIVATE - sqapi -) \ No newline at end of file diff --git a/linux-arm.cmake b/linux-arm.cmake deleted file mode 100644 index 0e435e3..0000000 --- a/linux-arm.cmake +++ /dev/null @@ -1,29 +0,0 @@ -# Simple toolchain file for compiling under linux -# Usage: cmake .. -DCMAKE_TOOLCHAIN_FILE=linux-arm.cmake - -# specify the target system properties -set(CMAKE_SYSTEM_NAME Linux) -set(CMAKE_SYSTEM_PROCESSOR arm) - -# specify cross compiler -set(CMAKE_C_COMPILER arm-linux-gnueabihf-gcc) -set(CMAKE_CXX_COMPILER arm-linux-gnueabihf-g++) - -# specify the paths for find_(name), functions (target environment). -set(CMAKE_FIND_ROOT_PATH - /usr/lib - /usr/arm-linux-gnueabihf - ${CMAKE_CURRENT_SOURCE_DIR} -) - -# search only for programs in the build host directories (find_program) -set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) - -# use only CMAKE_FIND_ROOT_PATH for searching (find_library) -set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) - -# use only CMAKE_FIND_ROOT_PATH for searching (find_file, find_path) -set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) - -# use only CMAKE_FIND_ROOT_PATH for searching (find_package) -set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY) \ No newline at end of file diff --git a/linux-arm64.cmake b/linux-arm64.cmake deleted file mode 100644 index 9393287..0000000 --- a/linux-arm64.cmake +++ /dev/null @@ -1,29 +0,0 @@ -# Simple toolchain file for compiling under linux -# Usage: cmake .. -DCMAKE_TOOLCHAIN_FILE=linux-arm64.cmake - -# specify the target system properties -set(CMAKE_SYSTEM_NAME Linux) -set(CMAKE_SYSTEM_PROCESSOR aarch64) - -# specify cross compiler -set(CMAKE_C_COMPILER aarch64-linux-gnu-gcc) - set(CMAKE_CXX_COMPILER aarch64-linux-gnu-g++) - -# specify the paths for find_(name), functions (target environment). -set(CMAKE_FIND_ROOT_PATH - /usr/lib - /usr/aarch64-linux-gnu - ${CMAKE_CURRENT_SOURCE_DIR} -) - -# search only for programs in the build host directories (find_program) -set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) - -# use only CMAKE_FIND_ROOT_PATH for searching (find_library) -set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) - -# use only CMAKE_FIND_ROOT_PATH for searching (find_file, find_path) -set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) - -# use only CMAKE_FIND_ROOT_PATH for searching (find_package) -set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY) \ No newline at end of file diff --git a/docs/classes/game/Daedalus.md b/python/docs/classes/game/Daedalus.md similarity index 100% rename from docs/classes/game/Daedalus.md rename to python/docs/classes/game/Daedalus.md diff --git a/docs/classes/game/DamageDescription.md b/python/docs/classes/game/DamageDescription.md similarity index 100% rename from docs/classes/game/DamageDescription.md rename to python/docs/classes/game/DamageDescription.md diff --git a/docs/classes/game/Sky.md b/python/docs/classes/game/Sky.md similarity index 100% rename from docs/classes/game/Sky.md rename to python/docs/classes/game/Sky.md diff --git a/docs/classes/item/ItemGround.md b/python/docs/classes/item/ItemGround.md similarity index 100% rename from docs/classes/item/ItemGround.md rename to python/docs/classes/item/ItemGround.md diff --git a/docs/classes/item/ItemsGround.md b/python/docs/classes/item/ItemsGround.md similarity index 100% rename from docs/classes/item/ItemsGround.md rename to python/docs/classes/item/ItemsGround.md diff --git a/docs/classes/mds/mds.md b/python/docs/classes/mds/Mds.md similarity index 100% rename from docs/classes/mds/mds.md rename to python/docs/classes/mds/Mds.md diff --git a/docs/classes/network/Packet.md b/python/docs/classes/network/Packet.md similarity index 100% rename from docs/classes/network/Packet.md rename to python/docs/classes/network/Packet.md diff --git a/docs/classes/waypoint/Way.md b/python/docs/classes/waypoint/Way.md similarity index 100% rename from docs/classes/waypoint/Way.md rename to python/docs/classes/waypoint/Way.md diff --git a/docs/comparing.md b/python/docs/comparing.md similarity index 100% rename from docs/comparing.md rename to python/docs/comparing.md diff --git a/docs/constants/anticheat.md b/python/docs/constants/anticheat.md similarity index 100% rename from docs/constants/anticheat.md rename to python/docs/constants/anticheat.md diff --git a/docs/constants/context.md b/python/docs/constants/context.md similarity index 100% rename from docs/constants/context.md rename to python/docs/constants/context.md diff --git a/docs/constants/damage.md b/python/docs/constants/damage.md similarity index 100% rename from docs/constants/damage.md rename to python/docs/constants/damage.md diff --git a/docs/constants/general.md b/python/docs/constants/general.md similarity index 100% rename from docs/constants/general.md rename to python/docs/constants/general.md diff --git a/docs/constants/hand.md b/python/docs/constants/hand.md similarity index 100% rename from docs/constants/hand.md rename to python/docs/constants/hand.md diff --git a/docs/constants/item.md b/python/docs/constants/item.md similarity index 100% rename from docs/constants/item.md rename to python/docs/constants/item.md diff --git a/docs/constants/network.md b/python/docs/constants/network.md similarity index 100% rename from docs/constants/network.md rename to python/docs/constants/network.md diff --git a/docs/constants/npc.md b/python/docs/constants/npc.md similarity index 100% rename from docs/constants/npc.md rename to python/docs/constants/npc.md diff --git a/docs/constants/reliability.md b/python/docs/constants/reliability.md similarity index 100% rename from docs/constants/reliability.md rename to python/docs/constants/reliability.md diff --git a/docs/constants/skill-weapon.md b/python/docs/constants/skill-weapon.md similarity index 100% rename from docs/constants/skill-weapon.md rename to python/docs/constants/skill-weapon.md diff --git a/docs/constants/talent.md b/python/docs/constants/talent.md similarity index 100% rename from docs/constants/talent.md rename to python/docs/constants/talent.md diff --git a/docs/constants/weapon-mode.md b/python/docs/constants/weapon-mode.md similarity index 100% rename from docs/constants/weapon-mode.md rename to python/docs/constants/weapon-mode.md diff --git a/docs/constants/weather.md b/python/docs/constants/weather.md similarity index 100% rename from docs/constants/weather.md rename to python/docs/constants/weather.md diff --git a/docs/defaultEvents/anticheat/onPlayerUseCheat.md b/python/docs/defaultEvents/anticheat/onPlayerUseCheat.md similarity index 100% rename from docs/defaultEvents/anticheat/onPlayerUseCheat.md rename to python/docs/defaultEvents/anticheat/onPlayerUseCheat.md diff --git a/docs/defaultEvents/general/onBan.md b/python/docs/defaultEvents/general/onBan.md similarity index 100% rename from docs/defaultEvents/general/onBan.md rename to python/docs/defaultEvents/general/onBan.md diff --git a/docs/defaultEvents/general/onExit.md b/python/docs/defaultEvents/general/onExit.md similarity index 100% rename from docs/defaultEvents/general/onExit.md rename to python/docs/defaultEvents/general/onExit.md diff --git a/docs/defaultEvents/general/onInit.md b/python/docs/defaultEvents/general/onInit.md similarity index 100% rename from docs/defaultEvents/general/onInit.md rename to python/docs/defaultEvents/general/onInit.md diff --git a/docs/defaultEvents/general/onTick.md b/python/docs/defaultEvents/general/onTick.md similarity index 100% rename from docs/defaultEvents/general/onTick.md rename to python/docs/defaultEvents/general/onTick.md diff --git a/docs/defaultEvents/general/onTime.md b/python/docs/defaultEvents/general/onTime.md similarity index 100% rename from docs/defaultEvents/general/onTime.md rename to python/docs/defaultEvents/general/onTime.md diff --git a/docs/defaultEvents/general/onUnban.md b/python/docs/defaultEvents/general/onUnban.md similarity index 100% rename from docs/defaultEvents/general/onUnban.md rename to python/docs/defaultEvents/general/onUnban.md diff --git a/docs/defaultEvents/network/onPacket.md b/python/docs/defaultEvents/network/onPacket.md similarity index 100% rename from docs/defaultEvents/network/onPacket.md rename to python/docs/defaultEvents/network/onPacket.md diff --git a/docs/defaultEvents/npc/onNpcActionFinished.md b/python/docs/defaultEvents/npc/onNpcActionFinished.md similarity index 100% rename from docs/defaultEvents/npc/onNpcActionFinished.md rename to python/docs/defaultEvents/npc/onNpcActionFinished.md diff --git a/docs/defaultEvents/npc/onNpcActionSent.md b/python/docs/defaultEvents/npc/onNpcActionSent.md similarity index 100% rename from docs/defaultEvents/npc/onNpcActionSent.md rename to python/docs/defaultEvents/npc/onNpcActionSent.md diff --git a/docs/defaultEvents/npc/onNpcChangeHostPlayer.md b/python/docs/defaultEvents/npc/onNpcChangeHostPlayer.md similarity index 100% rename from docs/defaultEvents/npc/onNpcChangeHostPlayer.md rename to python/docs/defaultEvents/npc/onNpcChangeHostPlayer.md diff --git a/docs/defaultEvents/npc/onNpcCreated.md b/python/docs/defaultEvents/npc/onNpcCreated.md similarity index 100% rename from docs/defaultEvents/npc/onNpcCreated.md rename to python/docs/defaultEvents/npc/onNpcCreated.md diff --git a/docs/defaultEvents/npc/onNpcDestroyed.md b/python/docs/defaultEvents/npc/onNpcDestroyed.md similarity index 100% rename from docs/defaultEvents/npc/onNpcDestroyed.md rename to python/docs/defaultEvents/npc/onNpcDestroyed.md diff --git a/docs/defaultEvents/player/onPlayerChangeColor.md b/python/docs/defaultEvents/player/onPlayerChangeColor.md similarity index 100% rename from docs/defaultEvents/player/onPlayerChangeColor.md rename to python/docs/defaultEvents/player/onPlayerChangeColor.md diff --git a/docs/defaultEvents/player/onPlayerChangeFocus.md b/python/docs/defaultEvents/player/onPlayerChangeFocus.md similarity index 100% rename from docs/defaultEvents/player/onPlayerChangeFocus.md rename to python/docs/defaultEvents/player/onPlayerChangeFocus.md diff --git a/docs/defaultEvents/player/onPlayerChangeHealth.md b/python/docs/defaultEvents/player/onPlayerChangeHealth.md similarity index 100% rename from docs/defaultEvents/player/onPlayerChangeHealth.md rename to python/docs/defaultEvents/player/onPlayerChangeHealth.md diff --git a/docs/defaultEvents/player/onPlayerChangeMana.md b/python/docs/defaultEvents/player/onPlayerChangeMana.md similarity index 100% rename from docs/defaultEvents/player/onPlayerChangeMana.md rename to python/docs/defaultEvents/player/onPlayerChangeMana.md diff --git a/docs/defaultEvents/player/onPlayerChangeMaxHealth.md b/python/docs/defaultEvents/player/onPlayerChangeMaxHealth.md similarity index 100% rename from docs/defaultEvents/player/onPlayerChangeMaxHealth.md rename to python/docs/defaultEvents/player/onPlayerChangeMaxHealth.md diff --git a/docs/defaultEvents/player/onPlayerChangeMaxMana.md b/python/docs/defaultEvents/player/onPlayerChangeMaxMana.md similarity index 100% rename from docs/defaultEvents/player/onPlayerChangeMaxMana.md rename to python/docs/defaultEvents/player/onPlayerChangeMaxMana.md diff --git a/docs/defaultEvents/player/onPlayerChangeWeaponMode.md b/python/docs/defaultEvents/player/onPlayerChangeWeaponMode.md similarity index 100% rename from docs/defaultEvents/player/onPlayerChangeWeaponMode.md rename to python/docs/defaultEvents/player/onPlayerChangeWeaponMode.md diff --git a/docs/defaultEvents/player/onPlayerChangeWorld.md b/python/docs/defaultEvents/player/onPlayerChangeWorld.md similarity index 100% rename from docs/defaultEvents/player/onPlayerChangeWorld.md rename to python/docs/defaultEvents/player/onPlayerChangeWorld.md diff --git a/docs/defaultEvents/player/onPlayerCommand.md b/python/docs/defaultEvents/player/onPlayerCommand.md similarity index 100% rename from docs/defaultEvents/player/onPlayerCommand.md rename to python/docs/defaultEvents/player/onPlayerCommand.md diff --git a/docs/defaultEvents/player/onPlayerDamage.md b/python/docs/defaultEvents/player/onPlayerDamage.md similarity index 100% rename from docs/defaultEvents/player/onPlayerDamage.md rename to python/docs/defaultEvents/player/onPlayerDamage.md diff --git a/docs/defaultEvents/player/onPlayerDead.md b/python/docs/defaultEvents/player/onPlayerDead.md similarity index 100% rename from docs/defaultEvents/player/onPlayerDead.md rename to python/docs/defaultEvents/player/onPlayerDead.md diff --git a/docs/defaultEvents/player/onPlayerDisconnect.md b/python/docs/defaultEvents/player/onPlayerDisconnect.md similarity index 100% rename from docs/defaultEvents/player/onPlayerDisconnect.md rename to python/docs/defaultEvents/player/onPlayerDisconnect.md diff --git a/docs/defaultEvents/player/onPlayerDropItem.md b/python/docs/defaultEvents/player/onPlayerDropItem.md similarity index 100% rename from docs/defaultEvents/player/onPlayerDropItem.md rename to python/docs/defaultEvents/player/onPlayerDropItem.md diff --git a/docs/defaultEvents/player/onPlayerEnterWorld.md b/python/docs/defaultEvents/player/onPlayerEnterWorld.md similarity index 100% rename from docs/defaultEvents/player/onPlayerEnterWorld.md rename to python/docs/defaultEvents/player/onPlayerEnterWorld.md diff --git a/docs/defaultEvents/player/onPlayerEquipAmulet.md b/python/docs/defaultEvents/player/onPlayerEquipAmulet.md similarity index 100% rename from docs/defaultEvents/player/onPlayerEquipAmulet.md rename to python/docs/defaultEvents/player/onPlayerEquipAmulet.md diff --git a/docs/defaultEvents/player/onPlayerEquipArmor.md b/python/docs/defaultEvents/player/onPlayerEquipArmor.md similarity index 100% rename from docs/defaultEvents/player/onPlayerEquipArmor.md rename to python/docs/defaultEvents/player/onPlayerEquipArmor.md diff --git a/docs/defaultEvents/player/onPlayerEquipBelt.md b/python/docs/defaultEvents/player/onPlayerEquipBelt.md similarity index 100% rename from docs/defaultEvents/player/onPlayerEquipBelt.md rename to python/docs/defaultEvents/player/onPlayerEquipBelt.md diff --git a/docs/defaultEvents/player/onPlayerEquipHandItem.md b/python/docs/defaultEvents/player/onPlayerEquipHandItem.md similarity index 100% rename from docs/defaultEvents/player/onPlayerEquipHandItem.md rename to python/docs/defaultEvents/player/onPlayerEquipHandItem.md diff --git a/docs/defaultEvents/player/onPlayerEquipHelmet.md b/python/docs/defaultEvents/player/onPlayerEquipHelmet.md similarity index 100% rename from docs/defaultEvents/player/onPlayerEquipHelmet.md rename to python/docs/defaultEvents/player/onPlayerEquipHelmet.md diff --git a/docs/defaultEvents/player/onPlayerEquipMeleeWeapon.md b/python/docs/defaultEvents/player/onPlayerEquipMeleeWeapon.md similarity index 100% rename from docs/defaultEvents/player/onPlayerEquipMeleeWeapon.md rename to python/docs/defaultEvents/player/onPlayerEquipMeleeWeapon.md diff --git a/docs/defaultEvents/player/onPlayerEquipRangedWeapon.md b/python/docs/defaultEvents/player/onPlayerEquipRangedWeapon.md similarity index 100% rename from docs/defaultEvents/player/onPlayerEquipRangedWeapon.md rename to python/docs/defaultEvents/player/onPlayerEquipRangedWeapon.md diff --git a/docs/defaultEvents/player/onPlayerEquipRing.md b/python/docs/defaultEvents/player/onPlayerEquipRing.md similarity index 100% rename from docs/defaultEvents/player/onPlayerEquipRing.md rename to python/docs/defaultEvents/player/onPlayerEquipRing.md diff --git a/docs/defaultEvents/player/onPlayerEquipShield.md b/python/docs/defaultEvents/player/onPlayerEquipShield.md similarity index 100% rename from docs/defaultEvents/player/onPlayerEquipShield.md rename to python/docs/defaultEvents/player/onPlayerEquipShield.md diff --git a/docs/defaultEvents/player/onPlayerEquipSpell.md b/python/docs/defaultEvents/player/onPlayerEquipSpell.md similarity index 100% rename from docs/defaultEvents/player/onPlayerEquipSpell.md rename to python/docs/defaultEvents/player/onPlayerEquipSpell.md diff --git a/docs/defaultEvents/player/onPlayerJoin.md b/python/docs/defaultEvents/player/onPlayerJoin.md similarity index 100% rename from docs/defaultEvents/player/onPlayerJoin.md rename to python/docs/defaultEvents/player/onPlayerJoin.md diff --git a/docs/defaultEvents/player/onPlayerMessage.md b/python/docs/defaultEvents/player/onPlayerMessage.md similarity index 100% rename from docs/defaultEvents/player/onPlayerMessage.md rename to python/docs/defaultEvents/player/onPlayerMessage.md diff --git a/docs/defaultEvents/player/onPlayerMobInteract.md b/python/docs/defaultEvents/player/onPlayerMobInteract.md similarity index 100% rename from docs/defaultEvents/player/onPlayerMobInteract.md rename to python/docs/defaultEvents/player/onPlayerMobInteract.md diff --git a/docs/defaultEvents/player/onPlayerRespawn.md b/python/docs/defaultEvents/player/onPlayerRespawn.md similarity index 100% rename from docs/defaultEvents/player/onPlayerRespawn.md rename to python/docs/defaultEvents/player/onPlayerRespawn.md diff --git a/docs/defaultEvents/player/onPlayerShoot.md b/python/docs/defaultEvents/player/onPlayerShoot.md similarity index 100% rename from docs/defaultEvents/player/onPlayerShoot.md rename to python/docs/defaultEvents/player/onPlayerShoot.md diff --git a/docs/defaultEvents/player/onPlayerSpellCast.md b/python/docs/defaultEvents/player/onPlayerSpellCast.md similarity index 100% rename from docs/defaultEvents/player/onPlayerSpellCast.md rename to python/docs/defaultEvents/player/onPlayerSpellCast.md diff --git a/docs/defaultEvents/player/onPlayerSpellSetup.md b/python/docs/defaultEvents/player/onPlayerSpellSetup.md similarity index 100% rename from docs/defaultEvents/player/onPlayerSpellSetup.md rename to python/docs/defaultEvents/player/onPlayerSpellSetup.md diff --git a/docs/defaultEvents/player/onPlayerTakeItem.md b/python/docs/defaultEvents/player/onPlayerTakeItem.md similarity index 100% rename from docs/defaultEvents/player/onPlayerTakeItem.md rename to python/docs/defaultEvents/player/onPlayerTakeItem.md diff --git a/docs/defaultEvents/player/onPlayerTeleport.md b/python/docs/defaultEvents/player/onPlayerTeleport.md similarity index 100% rename from docs/defaultEvents/player/onPlayerTeleport.md rename to python/docs/defaultEvents/player/onPlayerTeleport.md diff --git a/docs/defaultEvents/player/onPlayerToggleFaceAni.md b/python/docs/defaultEvents/player/onPlayerToggleFaceAni.md similarity index 100% rename from docs/defaultEvents/player/onPlayerToggleFaceAni.md rename to python/docs/defaultEvents/player/onPlayerToggleFaceAni.md diff --git a/docs/functions/chat/sendMessageToAll.md b/python/docs/functions/chat/sendMessageToAll.md similarity index 100% rename from docs/functions/chat/sendMessageToAll.md rename to python/docs/functions/chat/sendMessageToAll.md diff --git a/docs/functions/chat/sendMessageToPlayer.md b/python/docs/functions/chat/sendMessageToPlayer.md similarity index 100% rename from docs/functions/chat/sendMessageToPlayer.md rename to python/docs/functions/chat/sendMessageToPlayer.md diff --git a/docs/functions/chat/sendPlayerMessageToAll.md b/python/docs/functions/chat/sendPlayerMessageToAll.md similarity index 100% rename from docs/functions/chat/sendPlayerMessageToAll.md rename to python/docs/functions/chat/sendPlayerMessageToAll.md diff --git a/docs/functions/chat/sendPlayerMessageToPlayer.md b/python/docs/functions/chat/sendPlayerMessageToPlayer.md similarity index 100% rename from docs/functions/chat/sendPlayerMessageToPlayer.md rename to python/docs/functions/chat/sendPlayerMessageToPlayer.md diff --git a/docs/functions/event/addEvent.md b/python/docs/functions/event/addEvent.md similarity index 100% rename from docs/functions/event/addEvent.md rename to python/docs/functions/event/addEvent.md diff --git a/docs/functions/event/callEvent.md b/python/docs/functions/event/callEvent.md similarity index 100% rename from docs/functions/event/callEvent.md rename to python/docs/functions/event/callEvent.md diff --git a/docs/functions/event/event.md b/python/docs/functions/event/event.md similarity index 100% rename from docs/functions/event/event.md rename to python/docs/functions/event/event.md diff --git a/docs/functions/event/removeEvent.md b/python/docs/functions/event/removeEvent.md similarity index 100% rename from docs/functions/event/removeEvent.md rename to python/docs/functions/event/removeEvent.md diff --git a/docs/functions/event/removeEventHandler.md b/python/docs/functions/event/removeEventHandler.md similarity index 100% rename from docs/functions/event/removeEventHandler.md rename to python/docs/functions/event/removeEventHandler.md diff --git a/docs/functions/event/toggleEvent.md b/python/docs/functions/event/toggleEvent.md similarity index 100% rename from docs/functions/event/toggleEvent.md rename to python/docs/functions/event/toggleEvent.md diff --git a/docs/functions/game/exit.md b/python/docs/functions/game/exit.md similarity index 100% rename from docs/functions/game/exit.md rename to python/docs/functions/game/exit.md diff --git a/docs/functions/game/getDayLength.md b/python/docs/functions/game/getDayLength.md similarity index 100% rename from docs/functions/game/getDayLength.md rename to python/docs/functions/game/getDayLength.md diff --git a/docs/functions/game/getHostname.md b/python/docs/functions/game/getHostname.md similarity index 100% rename from docs/functions/game/getHostname.md rename to python/docs/functions/game/getHostname.md diff --git a/docs/functions/game/getMaxSlots.md b/python/docs/functions/game/getMaxSlots.md similarity index 100% rename from docs/functions/game/getMaxSlots.md rename to python/docs/functions/game/getMaxSlots.md diff --git a/docs/functions/game/getPlayersCount.md b/python/docs/functions/game/getPlayersCount.md similarity index 100% rename from docs/functions/game/getPlayersCount.md rename to python/docs/functions/game/getPlayersCount.md diff --git a/docs/functions/game/getServerDescription.md b/python/docs/functions/game/getServerDescription.md similarity index 100% rename from docs/functions/game/getServerDescription.md rename to python/docs/functions/game/getServerDescription.md diff --git a/docs/functions/game/getServerWorld.md b/python/docs/functions/game/getServerWorld.md similarity index 100% rename from docs/functions/game/getServerWorld.md rename to python/docs/functions/game/getServerWorld.md diff --git a/docs/functions/game/getTime.md b/python/docs/functions/game/getTime.md similarity index 100% rename from docs/functions/game/getTime.md rename to python/docs/functions/game/getTime.md diff --git a/docs/functions/game/serverLog.md b/python/docs/functions/game/serverLog.md similarity index 100% rename from docs/functions/game/serverLog.md rename to python/docs/functions/game/serverLog.md diff --git a/docs/functions/game/setDayLength.md b/python/docs/functions/game/setDayLength.md similarity index 100% rename from docs/functions/game/setDayLength.md rename to python/docs/functions/game/setDayLength.md diff --git a/docs/functions/game/setServerDescription.md b/python/docs/functions/game/setServerDescription.md similarity index 100% rename from docs/functions/game/setServerDescription.md rename to python/docs/functions/game/setServerDescription.md diff --git a/docs/functions/game/setServerWorld.md b/python/docs/functions/game/setServerWorld.md similarity index 100% rename from docs/functions/game/setServerWorld.md rename to python/docs/functions/game/setServerWorld.md diff --git a/docs/functions/game/setTime.md b/python/docs/functions/game/setTime.md similarity index 100% rename from docs/functions/game/setTime.md rename to python/docs/functions/game/setTime.md diff --git a/docs/functions/npc/clearNpcActions.md b/python/docs/functions/npc/clearNpcActions.md similarity index 100% rename from docs/functions/npc/clearNpcActions.md rename to python/docs/functions/npc/clearNpcActions.md diff --git a/docs/functions/npc/createNpc.md b/python/docs/functions/npc/createNpc.md similarity index 100% rename from docs/functions/npc/createNpc.md rename to python/docs/functions/npc/createNpc.md diff --git a/docs/functions/npc/destroyNpc.md b/python/docs/functions/npc/destroyNpc.md similarity index 100% rename from docs/functions/npc/destroyNpc.md rename to python/docs/functions/npc/destroyNpc.md diff --git a/docs/functions/npc/getNpcAction.md b/python/docs/functions/npc/getNpcAction.md similarity index 100% rename from docs/functions/npc/getNpcAction.md rename to python/docs/functions/npc/getNpcAction.md diff --git a/docs/functions/npc/getNpcActions.md b/python/docs/functions/npc/getNpcActions.md similarity index 100% rename from docs/functions/npc/getNpcActions.md rename to python/docs/functions/npc/getNpcActions.md diff --git a/docs/functions/npc/getNpcActionsCount.md b/python/docs/functions/npc/getNpcActionsCount.md similarity index 100% rename from docs/functions/npc/getNpcActionsCount.md rename to python/docs/functions/npc/getNpcActionsCount.md diff --git a/docs/functions/npc/getNpcHostPlayer.md b/python/docs/functions/npc/getNpcHostPlayer.md similarity index 100% rename from docs/functions/npc/getNpcHostPlayer.md rename to python/docs/functions/npc/getNpcHostPlayer.md diff --git a/docs/functions/npc/getNpcLastActionId.md b/python/docs/functions/npc/getNpcLastActionId.md similarity index 100% rename from docs/functions/npc/getNpcLastActionId.md rename to python/docs/functions/npc/getNpcLastActionId.md diff --git a/docs/functions/npc/isNpc.md b/python/docs/functions/npc/isNpc.md similarity index 100% rename from docs/functions/npc/isNpc.md rename to python/docs/functions/npc/isNpc.md diff --git a/docs/functions/npc/isNpcActionFinished.md b/python/docs/functions/npc/isNpcActionFinished.md similarity index 100% rename from docs/functions/npc/isNpcActionFinished.md rename to python/docs/functions/npc/isNpcActionFinished.md diff --git a/docs/functions/npc/npcAttackMelee.md b/python/docs/functions/npc/npcAttackMelee.md similarity index 100% rename from docs/functions/npc/npcAttackMelee.md rename to python/docs/functions/npc/npcAttackMelee.md diff --git a/docs/functions/npc/npcAttackRanged.md b/python/docs/functions/npc/npcAttackRanged.md similarity index 100% rename from docs/functions/npc/npcAttackRanged.md rename to python/docs/functions/npc/npcAttackRanged.md diff --git a/docs/functions/npc/npcSpellCast.md b/python/docs/functions/npc/npcSpellCast.md similarity index 100% rename from docs/functions/npc/npcSpellCast.md rename to python/docs/functions/npc/npcSpellCast.md diff --git a/docs/functions/npc/npcUseClosestMob.md b/python/docs/functions/npc/npcUseClosestMob.md similarity index 100% rename from docs/functions/npc/npcUseClosestMob.md rename to python/docs/functions/npc/npcUseClosestMob.md diff --git a/docs/functions/npc/setNpcHostPlayer.md b/python/docs/functions/npc/setNpcHostPlayer.md similarity index 100% rename from docs/functions/npc/setNpcHostPlayer.md rename to python/docs/functions/npc/setNpcHostPlayer.md diff --git a/docs/functions/player/addBan.md b/python/docs/functions/player/addBan.md similarity index 100% rename from docs/functions/player/addBan.md rename to python/docs/functions/player/addBan.md diff --git a/docs/functions/player/applyPlayerOverlay.md b/python/docs/functions/player/applyPlayerOverlay.md similarity index 100% rename from docs/functions/player/applyPlayerOverlay.md rename to python/docs/functions/player/applyPlayerOverlay.md diff --git a/docs/functions/player/ban.md b/python/docs/functions/player/ban.md similarity index 100% rename from docs/functions/player/ban.md rename to python/docs/functions/player/ban.md diff --git a/docs/functions/player/drawWeapon.md b/python/docs/functions/player/drawWeapon.md similarity index 100% rename from docs/functions/player/drawWeapon.md rename to python/docs/functions/player/drawWeapon.md diff --git a/docs/functions/player/equipItem.md b/python/docs/functions/player/equipItem.md similarity index 100% rename from docs/functions/player/equipItem.md rename to python/docs/functions/player/equipItem.md diff --git a/docs/functions/player/getPlayerAmulet.md b/python/docs/functions/player/getPlayerAmulet.md similarity index 100% rename from docs/functions/player/getPlayerAmulet.md rename to python/docs/functions/player/getPlayerAmulet.md diff --git a/docs/functions/player/getPlayerAngle.md b/python/docs/functions/player/getPlayerAngle.md similarity index 100% rename from docs/functions/player/getPlayerAngle.md rename to python/docs/functions/player/getPlayerAngle.md diff --git a/docs/functions/player/getPlayerAni.md b/python/docs/functions/player/getPlayerAni.md similarity index 100% rename from docs/functions/player/getPlayerAni.md rename to python/docs/functions/player/getPlayerAni.md diff --git a/docs/functions/player/getPlayerArmor.md b/python/docs/functions/player/getPlayerArmor.md similarity index 100% rename from docs/functions/player/getPlayerArmor.md rename to python/docs/functions/player/getPlayerArmor.md diff --git a/docs/functions/player/getPlayerAtVector.md b/python/docs/functions/player/getPlayerAtVector.md similarity index 100% rename from docs/functions/player/getPlayerAtVector.md rename to python/docs/functions/player/getPlayerAtVector.md diff --git a/docs/functions/player/getPlayerBelt.md b/python/docs/functions/player/getPlayerBelt.md similarity index 100% rename from docs/functions/player/getPlayerBelt.md rename to python/docs/functions/player/getPlayerBelt.md diff --git a/docs/functions/player/getPlayerCameraPosition.md b/python/docs/functions/player/getPlayerCameraPosition.md similarity index 100% rename from docs/functions/player/getPlayerCameraPosition.md rename to python/docs/functions/player/getPlayerCameraPosition.md diff --git a/docs/functions/player/getPlayerCollision.md b/python/docs/functions/player/getPlayerCollision.md similarity index 100% rename from docs/functions/player/getPlayerCollision.md rename to python/docs/functions/player/getPlayerCollision.md diff --git a/docs/functions/player/getPlayerColor.md b/python/docs/functions/player/getPlayerColor.md similarity index 100% rename from docs/functions/player/getPlayerColor.md rename to python/docs/functions/player/getPlayerColor.md diff --git a/docs/functions/player/getPlayerContext.md b/python/docs/functions/player/getPlayerContext.md similarity index 100% rename from docs/functions/player/getPlayerContext.md rename to python/docs/functions/player/getPlayerContext.md diff --git a/docs/functions/player/getPlayerDexterity.md b/python/docs/functions/player/getPlayerDexterity.md similarity index 100% rename from docs/functions/player/getPlayerDexterity.md rename to python/docs/functions/player/getPlayerDexterity.md diff --git a/docs/functions/player/getPlayerFaceAnis.md b/python/docs/functions/player/getPlayerFaceAnis.md similarity index 100% rename from docs/functions/player/getPlayerFaceAnis.md rename to python/docs/functions/player/getPlayerFaceAnis.md diff --git a/docs/functions/player/getPlayerFatness.md b/python/docs/functions/player/getPlayerFatness.md similarity index 100% rename from docs/functions/player/getPlayerFatness.md rename to python/docs/functions/player/getPlayerFatness.md diff --git a/docs/functions/player/getPlayerFocus.md b/python/docs/functions/player/getPlayerFocus.md similarity index 100% rename from docs/functions/player/getPlayerFocus.md rename to python/docs/functions/player/getPlayerFocus.md diff --git a/docs/functions/player/getPlayerHealth.md b/python/docs/functions/player/getPlayerHealth.md similarity index 100% rename from docs/functions/player/getPlayerHealth.md rename to python/docs/functions/player/getPlayerHealth.md diff --git a/docs/functions/player/getPlayerHelmet.md b/python/docs/functions/player/getPlayerHelmet.md similarity index 100% rename from docs/functions/player/getPlayerHelmet.md rename to python/docs/functions/player/getPlayerHelmet.md diff --git a/docs/functions/player/getPlayerIP.md b/python/docs/functions/player/getPlayerIP.md similarity index 100% rename from docs/functions/player/getPlayerIP.md rename to python/docs/functions/player/getPlayerIP.md diff --git a/docs/functions/player/getPlayerInstance.md b/python/docs/functions/player/getPlayerInstance.md similarity index 100% rename from docs/functions/player/getPlayerInstance.md rename to python/docs/functions/player/getPlayerInstance.md diff --git a/docs/functions/player/getPlayerInvisible.md b/python/docs/functions/player/getPlayerInvisible.md similarity index 100% rename from docs/functions/player/getPlayerInvisible.md rename to python/docs/functions/player/getPlayerInvisible.md diff --git a/docs/functions/player/getPlayerMacAddr.md b/python/docs/functions/player/getPlayerMacAddr.md similarity index 100% rename from docs/functions/player/getPlayerMacAddr.md rename to python/docs/functions/player/getPlayerMacAddr.md diff --git a/docs/functions/player/getPlayerMana.md b/python/docs/functions/player/getPlayerMana.md similarity index 100% rename from docs/functions/player/getPlayerMana.md rename to python/docs/functions/player/getPlayerMana.md diff --git a/docs/functions/player/getPlayerMaxHealth.md b/python/docs/functions/player/getPlayerMaxHealth.md similarity index 100% rename from docs/functions/player/getPlayerMaxHealth.md rename to python/docs/functions/player/getPlayerMaxHealth.md diff --git a/docs/functions/player/getPlayerMaxMana.md b/python/docs/functions/player/getPlayerMaxMana.md similarity index 100% rename from docs/functions/player/getPlayerMaxMana.md rename to python/docs/functions/player/getPlayerMaxMana.md diff --git a/docs/functions/player/getPlayerMeleeWeapon.md b/python/docs/functions/player/getPlayerMeleeWeapon.md similarity index 100% rename from docs/functions/player/getPlayerMeleeWeapon.md rename to python/docs/functions/player/getPlayerMeleeWeapon.md diff --git a/docs/functions/player/getPlayerName.md b/python/docs/functions/player/getPlayerName.md similarity index 100% rename from docs/functions/player/getPlayerName.md rename to python/docs/functions/player/getPlayerName.md diff --git a/docs/functions/player/getPlayerPing.md b/python/docs/functions/player/getPlayerPing.md similarity index 100% rename from docs/functions/player/getPlayerPing.md rename to python/docs/functions/player/getPlayerPing.md diff --git a/docs/functions/player/getPlayerPosition.md b/python/docs/functions/player/getPlayerPosition.md similarity index 100% rename from docs/functions/player/getPlayerPosition.md rename to python/docs/functions/player/getPlayerPosition.md diff --git a/docs/functions/player/getPlayerRangedWeapon.md b/python/docs/functions/player/getPlayerRangedWeapon.md similarity index 100% rename from docs/functions/player/getPlayerRangedWeapon.md rename to python/docs/functions/player/getPlayerRangedWeapon.md diff --git a/docs/functions/player/getPlayerRespawnTime.md b/python/docs/functions/player/getPlayerRespawnTime.md similarity index 100% rename from docs/functions/player/getPlayerRespawnTime.md rename to python/docs/functions/player/getPlayerRespawnTime.md diff --git a/docs/functions/player/getPlayerRing.md b/python/docs/functions/player/getPlayerRing.md similarity index 100% rename from docs/functions/player/getPlayerRing.md rename to python/docs/functions/player/getPlayerRing.md diff --git a/docs/functions/player/getPlayerScale.md b/python/docs/functions/player/getPlayerScale.md similarity index 100% rename from docs/functions/player/getPlayerScale.md rename to python/docs/functions/player/getPlayerScale.md diff --git a/docs/functions/player/getPlayerSerial.md b/python/docs/functions/player/getPlayerSerial.md similarity index 100% rename from docs/functions/player/getPlayerSerial.md rename to python/docs/functions/player/getPlayerSerial.md diff --git a/docs/functions/player/getPlayerShield.md b/python/docs/functions/player/getPlayerShield.md similarity index 100% rename from docs/functions/player/getPlayerShield.md rename to python/docs/functions/player/getPlayerShield.md diff --git a/docs/functions/player/getPlayerSkillWeapon.md b/python/docs/functions/player/getPlayerSkillWeapon.md similarity index 100% rename from docs/functions/player/getPlayerSkillWeapon.md rename to python/docs/functions/player/getPlayerSkillWeapon.md diff --git a/docs/functions/player/getPlayerSpell.md b/python/docs/functions/player/getPlayerSpell.md similarity index 100% rename from docs/functions/player/getPlayerSpell.md rename to python/docs/functions/player/getPlayerSpell.md diff --git a/docs/functions/player/getPlayerStrength.md b/python/docs/functions/player/getPlayerStrength.md similarity index 100% rename from docs/functions/player/getPlayerStrength.md rename to python/docs/functions/player/getPlayerStrength.md diff --git a/docs/functions/player/getPlayerTalent.md b/python/docs/functions/player/getPlayerTalent.md similarity index 100% rename from docs/functions/player/getPlayerTalent.md rename to python/docs/functions/player/getPlayerTalent.md diff --git a/docs/functions/player/getPlayerUID.md b/python/docs/functions/player/getPlayerUID.md similarity index 100% rename from docs/functions/player/getPlayerUID.md rename to python/docs/functions/player/getPlayerUID.md diff --git a/docs/functions/player/getPlayerVirtualWorld.md b/python/docs/functions/player/getPlayerVirtualWorld.md similarity index 100% rename from docs/functions/player/getPlayerVirtualWorld.md rename to python/docs/functions/player/getPlayerVirtualWorld.md diff --git a/docs/functions/player/getPlayerVisual.md b/python/docs/functions/player/getPlayerVisual.md similarity index 100% rename from docs/functions/player/getPlayerVisual.md rename to python/docs/functions/player/getPlayerVisual.md diff --git a/docs/functions/player/getPlayerWeaponMode.md b/python/docs/functions/player/getPlayerWeaponMode.md similarity index 100% rename from docs/functions/player/getPlayerWeaponMode.md rename to python/docs/functions/player/getPlayerWeaponMode.md diff --git a/docs/functions/player/getPlayerWorld.md b/python/docs/functions/player/getPlayerWorld.md similarity index 100% rename from docs/functions/player/getPlayerWorld.md rename to python/docs/functions/player/getPlayerWorld.md diff --git a/docs/functions/player/giveItem.md b/python/docs/functions/player/giveItem.md similarity index 100% rename from docs/functions/player/giveItem.md rename to python/docs/functions/player/giveItem.md diff --git a/docs/functions/player/hitPlayer.md b/python/docs/functions/player/hitPlayer.md similarity index 100% rename from docs/functions/player/hitPlayer.md rename to python/docs/functions/player/hitPlayer.md diff --git a/docs/functions/player/isPlayerConnected.md b/python/docs/functions/player/isPlayerConnected.md similarity index 100% rename from docs/functions/player/isPlayerConnected.md rename to python/docs/functions/player/isPlayerConnected.md diff --git a/docs/functions/player/isPlayerDead.md b/python/docs/functions/player/isPlayerDead.md similarity index 100% rename from docs/functions/player/isPlayerDead.md rename to python/docs/functions/player/isPlayerDead.md diff --git a/docs/functions/player/isPlayerSpawned.md b/python/docs/functions/player/isPlayerSpawned.md similarity index 100% rename from docs/functions/player/isPlayerSpawned.md rename to python/docs/functions/player/isPlayerSpawned.md diff --git a/docs/functions/player/isPlayerUnconscious.md b/python/docs/functions/player/isPlayerUnconscious.md similarity index 100% rename from docs/functions/player/isPlayerUnconscious.md rename to python/docs/functions/player/isPlayerUnconscious.md diff --git a/docs/functions/player/kick.md b/python/docs/functions/player/kick.md similarity index 100% rename from docs/functions/player/kick.md rename to python/docs/functions/player/kick.md diff --git a/docs/functions/player/playAni.md b/python/docs/functions/player/playAni.md similarity index 100% rename from docs/functions/player/playAni.md rename to python/docs/functions/player/playAni.md diff --git a/docs/functions/player/playFaceAni.md b/python/docs/functions/player/playFaceAni.md similarity index 100% rename from docs/functions/player/playFaceAni.md rename to python/docs/functions/player/playFaceAni.md diff --git a/docs/functions/player/readySpell.md b/python/docs/functions/player/readySpell.md similarity index 100% rename from docs/functions/player/readySpell.md rename to python/docs/functions/player/readySpell.md diff --git a/docs/functions/player/removeItem.md b/python/docs/functions/player/removeItem.md similarity index 100% rename from docs/functions/player/removeItem.md rename to python/docs/functions/player/removeItem.md diff --git a/docs/functions/player/removePlayerOverlay.md b/python/docs/functions/player/removePlayerOverlay.md similarity index 100% rename from docs/functions/player/removePlayerOverlay.md rename to python/docs/functions/player/removePlayerOverlay.md diff --git a/docs/functions/player/removeWeapon.md b/python/docs/functions/player/removeWeapon.md similarity index 100% rename from docs/functions/player/removeWeapon.md rename to python/docs/functions/player/removeWeapon.md diff --git a/docs/functions/player/setPlayerAngle.md b/python/docs/functions/player/setPlayerAngle.md similarity index 100% rename from docs/functions/player/setPlayerAngle.md rename to python/docs/functions/player/setPlayerAngle.md diff --git a/docs/functions/player/setPlayerCollision.md b/python/docs/functions/player/setPlayerCollision.md similarity index 100% rename from docs/functions/player/setPlayerCollision.md rename to python/docs/functions/player/setPlayerCollision.md diff --git a/docs/functions/player/setPlayerColor.md b/python/docs/functions/player/setPlayerColor.md similarity index 100% rename from docs/functions/player/setPlayerColor.md rename to python/docs/functions/player/setPlayerColor.md diff --git a/docs/functions/player/setPlayerDexterity.md b/python/docs/functions/player/setPlayerDexterity.md similarity index 100% rename from docs/functions/player/setPlayerDexterity.md rename to python/docs/functions/player/setPlayerDexterity.md diff --git a/docs/functions/player/setPlayerFatness.md b/python/docs/functions/player/setPlayerFatness.md similarity index 100% rename from docs/functions/player/setPlayerFatness.md rename to python/docs/functions/player/setPlayerFatness.md diff --git a/docs/functions/player/setPlayerHealth.md b/python/docs/functions/player/setPlayerHealth.md similarity index 100% rename from docs/functions/player/setPlayerHealth.md rename to python/docs/functions/player/setPlayerHealth.md diff --git a/docs/functions/player/setPlayerInstance.md b/python/docs/functions/player/setPlayerInstance.md similarity index 100% rename from docs/functions/player/setPlayerInstance.md rename to python/docs/functions/player/setPlayerInstance.md diff --git a/docs/functions/player/setPlayerInvisible.md b/python/docs/functions/player/setPlayerInvisible.md similarity index 100% rename from docs/functions/player/setPlayerInvisible.md rename to python/docs/functions/player/setPlayerInvisible.md diff --git a/docs/functions/player/setPlayerMana.md b/python/docs/functions/player/setPlayerMana.md similarity index 100% rename from docs/functions/player/setPlayerMana.md rename to python/docs/functions/player/setPlayerMana.md diff --git a/docs/functions/player/setPlayerMaxHealth.md b/python/docs/functions/player/setPlayerMaxHealth.md similarity index 100% rename from docs/functions/player/setPlayerMaxHealth.md rename to python/docs/functions/player/setPlayerMaxHealth.md diff --git a/docs/functions/player/setPlayerMaxMana.md b/python/docs/functions/player/setPlayerMaxMana.md similarity index 100% rename from docs/functions/player/setPlayerMaxMana.md rename to python/docs/functions/player/setPlayerMaxMana.md diff --git a/docs/functions/player/setPlayerName.md b/python/docs/functions/player/setPlayerName.md similarity index 100% rename from docs/functions/player/setPlayerName.md rename to python/docs/functions/player/setPlayerName.md diff --git a/docs/functions/player/setPlayerRespawnTime.md b/python/docs/functions/player/setPlayerRespawnTime.md similarity index 100% rename from docs/functions/player/setPlayerRespawnTime.md rename to python/docs/functions/player/setPlayerRespawnTime.md diff --git a/docs/functions/player/setPlayerScale.md b/python/docs/functions/player/setPlayerScale.md similarity index 100% rename from docs/functions/player/setPlayerScale.md rename to python/docs/functions/player/setPlayerScale.md diff --git a/docs/functions/player/setPlayerSkillWeapon.md b/python/docs/functions/player/setPlayerSkillWeapon.md similarity index 100% rename from docs/functions/player/setPlayerSkillWeapon.md rename to python/docs/functions/player/setPlayerSkillWeapon.md diff --git a/docs/functions/player/setPlayerStrength.md b/python/docs/functions/player/setPlayerStrength.md similarity index 100% rename from docs/functions/player/setPlayerStrength.md rename to python/docs/functions/player/setPlayerStrength.md diff --git a/docs/functions/player/setPlayerTalent.md b/python/docs/functions/player/setPlayerTalent.md similarity index 100% rename from docs/functions/player/setPlayerTalent.md rename to python/docs/functions/player/setPlayerTalent.md diff --git a/docs/functions/player/setPlayerVirtualWorld.md b/python/docs/functions/player/setPlayerVirtualWorld.md similarity index 100% rename from docs/functions/player/setPlayerVirtualWorld.md rename to python/docs/functions/player/setPlayerVirtualWorld.md diff --git a/docs/functions/player/setPlayerVisual.md b/python/docs/functions/player/setPlayerVisual.md similarity index 100% rename from docs/functions/player/setPlayerVisual.md rename to python/docs/functions/player/setPlayerVisual.md diff --git a/docs/functions/player/setPlayerWeaponMode.md b/python/docs/functions/player/setPlayerWeaponMode.md similarity index 100% rename from docs/functions/player/setPlayerWeaponMode.md rename to python/docs/functions/player/setPlayerWeaponMode.md diff --git a/docs/functions/player/setPlayerWorld.md b/python/docs/functions/player/setPlayerWorld.md similarity index 100% rename from docs/functions/player/setPlayerWorld.md rename to python/docs/functions/player/setPlayerWorld.md diff --git a/docs/functions/player/spawnPlayer.md b/python/docs/functions/player/spawnPlayer.md similarity index 100% rename from docs/functions/player/spawnPlayer.md rename to python/docs/functions/player/spawnPlayer.md diff --git a/docs/functions/player/stopAni.md b/python/docs/functions/player/stopAni.md similarity index 100% rename from docs/functions/player/stopAni.md rename to python/docs/functions/player/stopAni.md diff --git a/docs/functions/player/stopFaceAni.md b/python/docs/functions/player/stopFaceAni.md similarity index 100% rename from docs/functions/player/stopFaceAni.md rename to python/docs/functions/player/stopFaceAni.md diff --git a/docs/functions/player/unequipItem.md b/python/docs/functions/player/unequipItem.md similarity index 100% rename from docs/functions/player/unequipItem.md rename to python/docs/functions/player/unequipItem.md diff --git a/docs/functions/player/unreadySpell.md b/python/docs/functions/player/unreadySpell.md similarity index 100% rename from docs/functions/player/unreadySpell.md rename to python/docs/functions/player/unreadySpell.md diff --git a/docs/functions/player/unspawnPlayer.md b/python/docs/functions/player/unspawnPlayer.md similarity index 100% rename from docs/functions/player/unspawnPlayer.md rename to python/docs/functions/player/unspawnPlayer.md diff --git a/docs/functions/player/useItem.md b/python/docs/functions/player/useItem.md similarity index 100% rename from docs/functions/player/useItem.md rename to python/docs/functions/player/useItem.md diff --git a/docs/functions/player/useItemToState.md b/python/docs/functions/player/useItemToState.md similarity index 100% rename from docs/functions/player/useItemToState.md rename to python/docs/functions/player/useItemToState.md diff --git a/docs/functions/streamer/findNearbyPlayers.md b/python/docs/functions/streamer/findNearbyPlayers.md similarity index 100% rename from docs/functions/streamer/findNearbyPlayers.md rename to python/docs/functions/streamer/findNearbyPlayers.md diff --git a/docs/functions/streamer/getSpawnedPlayersForPlayer.md b/python/docs/functions/streamer/getSpawnedPlayersForPlayer.md similarity index 100% rename from docs/functions/streamer/getSpawnedPlayersForPlayer.md rename to python/docs/functions/streamer/getSpawnedPlayersForPlayer.md diff --git a/docs/functions/streamer/getStreamedPlayersByPlayer.md b/python/docs/functions/streamer/getStreamedPlayersByPlayer.md similarity index 100% rename from docs/functions/streamer/getStreamedPlayersByPlayer.md rename to python/docs/functions/streamer/getStreamedPlayersByPlayer.md diff --git a/docs/functions/waypoint/getNearestWaypoint.md b/python/docs/functions/waypoint/getNearestWaypoint.md similarity index 100% rename from docs/functions/waypoint/getNearestWaypoint.md rename to python/docs/functions/waypoint/getNearestWaypoint.md diff --git a/docs/functions/waypoint/getWaypoint.md b/python/docs/functions/waypoint/getWaypoint.md similarity index 100% rename from docs/functions/waypoint/getWaypoint.md rename to python/docs/functions/waypoint/getWaypoint.md diff --git a/docs/howto/localdebug.md b/python/docs/howto/localdebug.md similarity index 100% rename from docs/howto/localdebug.md rename to python/docs/howto/localdebug.md diff --git a/docs/index.md b/python/docs/index.md similarity index 100% rename from docs/index.md rename to python/docs/index.md diff --git a/docs/qna.md b/python/docs/qna.md similarity index 100% rename from docs/qna.md rename to python/docs/qna.md diff --git a/g2o/__init__.py b/python/g2o/__init__.py similarity index 100% rename from g2o/__init__.py rename to python/g2o/__init__.py diff --git a/g2o/classes/__init__.py b/python/g2o/classes/__init__.py similarity index 100% rename from g2o/classes/__init__.py rename to python/g2o/classes/__init__.py diff --git a/g2o/classes/daedalus.py b/python/g2o/classes/daedalus.py similarity index 100% rename from g2o/classes/daedalus.py rename to python/g2o/classes/daedalus.py diff --git a/g2o/classes/damage.py b/python/g2o/classes/damage.py similarity index 100% rename from g2o/classes/damage.py rename to python/g2o/classes/damage.py diff --git a/g2o/classes/items.py b/python/g2o/classes/items.py similarity index 100% rename from g2o/classes/items.py rename to python/g2o/classes/items.py diff --git a/g2o/classes/mds.py b/python/g2o/classes/mds.py similarity index 100% rename from g2o/classes/mds.py rename to python/g2o/classes/mds.py diff --git a/g2o/classes/packets.py b/python/g2o/classes/packets.py similarity index 100% rename from g2o/classes/packets.py rename to python/g2o/classes/packets.py diff --git a/g2o/classes/sky.py b/python/g2o/classes/sky.py similarity index 100% rename from g2o/classes/sky.py rename to python/g2o/classes/sky.py diff --git a/g2o/classes/way.py b/python/g2o/classes/way.py similarity index 100% rename from g2o/classes/way.py rename to python/g2o/classes/way.py diff --git a/g2o/constants/__init__.py b/python/g2o/constants/__init__.py similarity index 100% rename from g2o/constants/__init__.py rename to python/g2o/constants/__init__.py diff --git a/g2o/constants/anticheat.py b/python/g2o/constants/anticheat.py similarity index 100% rename from g2o/constants/anticheat.py rename to python/g2o/constants/anticheat.py diff --git a/g2o/constants/context.py b/python/g2o/constants/context.py similarity index 100% rename from g2o/constants/context.py rename to python/g2o/constants/context.py diff --git a/g2o/constants/damage.py b/python/g2o/constants/damage.py similarity index 100% rename from g2o/constants/damage.py rename to python/g2o/constants/damage.py diff --git a/g2o/constants/general.py b/python/g2o/constants/general.py similarity index 100% rename from g2o/constants/general.py rename to python/g2o/constants/general.py diff --git a/g2o/constants/hand.py b/python/g2o/constants/hand.py similarity index 100% rename from g2o/constants/hand.py rename to python/g2o/constants/hand.py diff --git a/g2o/constants/item.py b/python/g2o/constants/item.py similarity index 100% rename from g2o/constants/item.py rename to python/g2o/constants/item.py diff --git a/g2o/constants/network.py b/python/g2o/constants/network.py similarity index 100% rename from g2o/constants/network.py rename to python/g2o/constants/network.py diff --git a/g2o/constants/npc.py b/python/g2o/constants/npc.py similarity index 100% rename from g2o/constants/npc.py rename to python/g2o/constants/npc.py diff --git a/g2o/constants/reliability.py b/python/g2o/constants/reliability.py similarity index 100% rename from g2o/constants/reliability.py rename to python/g2o/constants/reliability.py diff --git a/g2o/constants/skillweapon.py b/python/g2o/constants/skillweapon.py similarity index 100% rename from g2o/constants/skillweapon.py rename to python/g2o/constants/skillweapon.py diff --git a/g2o/constants/talent.py b/python/g2o/constants/talent.py similarity index 100% rename from g2o/constants/talent.py rename to python/g2o/constants/talent.py diff --git a/g2o/constants/weaponmode.py b/python/g2o/constants/weaponmode.py similarity index 100% rename from g2o/constants/weaponmode.py rename to python/g2o/constants/weaponmode.py diff --git a/g2o/constants/weather.py b/python/g2o/constants/weather.py similarity index 100% rename from g2o/constants/weather.py rename to python/g2o/constants/weather.py diff --git a/g2o/functions/__init__.py b/python/g2o/functions/__init__.py similarity index 100% rename from g2o/functions/__init__.py rename to python/g2o/functions/__init__.py diff --git a/g2o/functions/chat.py b/python/g2o/functions/chat.py similarity index 100% rename from g2o/functions/chat.py rename to python/g2o/functions/chat.py diff --git a/g2o/functions/event.py b/python/g2o/functions/event.py similarity index 100% rename from g2o/functions/event.py rename to python/g2o/functions/event.py diff --git a/g2o/functions/game.py b/python/g2o/functions/game.py similarity index 100% rename from g2o/functions/game.py rename to python/g2o/functions/game.py diff --git a/g2o/functions/math.py b/python/g2o/functions/math.py similarity index 100% rename from g2o/functions/math.py rename to python/g2o/functions/math.py diff --git a/g2o/functions/npc.py b/python/g2o/functions/npc.py similarity index 100% rename from g2o/functions/npc.py rename to python/g2o/functions/npc.py diff --git a/g2o/functions/player.py b/python/g2o/functions/player.py similarity index 100% rename from g2o/functions/player.py rename to python/g2o/functions/player.py diff --git a/g2o/functions/streamer.py b/python/g2o/functions/streamer.py similarity index 100% rename from g2o/functions/streamer.py rename to python/g2o/functions/streamer.py diff --git a/g2o/functions/waypoint.py b/python/g2o/functions/waypoint.py similarity index 100% rename from g2o/functions/waypoint.py rename to python/g2o/functions/waypoint.py diff --git a/mkdocs.yml b/python/mkdocs.yml similarity index 100% rename from mkdocs.yml rename to python/mkdocs.yml diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt new file mode 100644 index 0000000..3558bf9 --- /dev/null +++ b/source/CMakeLists.txt @@ -0,0 +1,37 @@ + +add_library(${PYG2O_MODULE_NAME} SHARED + bind.cpp +) + +add_subdirectory(dependencies) +add_subdirectory(NoNut) +add_subdirectory(classes) +add_subdirectory(constants) +add_subdirectory(events) +add_subdirectory(functions) +add_subdirectory(types) + +# pybind11 requires to declare all modules before interpretor initializes, so we have to load main.cpp last +target_sources(${PYG2O_MODULE_NAME} + PRIVATE + main.cpp +) + +if(DEFINED OUT_FILE_SUFFIX) + set_target_properties(${PYG2O_MODULE_NAME} + PROPERTIES + PREFIX "" + SUFFIX ".${OUT_FILE_SUFFIX}${CMAKE_SHARED_LIBRARY_SUFFIX}" + ) +endif() + +# Use this code to auto copy module to your server folder for quick testing +# Change paths to your actual paths + +# add_custom_command(TARGET ${PYG2O_MODULE_NAME} POST_BUILD +# COMMAND ${CMAKE_COMMAND} -E copy +# ${CMAKE_BINARY_DIR}/source/${PYG2O_MODULE_NAME}.${OUT_FILE_SUFFIX}${CMAKE_SHARED_LIBRARY_SUFFIX} +# C:\\server-windows-x64 +# COMMAND ${CMAKE_COMMAND} -E copy_directory +# ${CMAKE_SOURCE_DIR}/python/g2o +# C:\\server-windows-x64\\g2o) \ No newline at end of file diff --git a/source/NoNut/CMakeLists.txt b/source/NoNut/CMakeLists.txt new file mode 100644 index 0000000..d14b014 --- /dev/null +++ b/source/NoNut/CMakeLists.txt @@ -0,0 +1,14 @@ + +target_sources(${PYG2O_MODULE_NAME} + PRIVATE + source/Array.cpp + source/Class.cpp + source/Constant.cpp + source/CustomTypes.cpp + source/StaticClass.cpp +) + +target_include_directories(${PYG2O_MODULE_NAME} + PRIVATE + "include/" +) \ No newline at end of file diff --git a/source/NoNut/LICENSE b/source/NoNut/LICENSE new file mode 100644 index 0000000..9c6472f --- /dev/null +++ b/source/NoNut/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) Martis + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. \ No newline at end of file diff --git a/source/NoNut/README.md b/source/NoNut/README.md new file mode 100644 index 0000000..d346c15 --- /dev/null +++ b/source/NoNut/README.md @@ -0,0 +1,2 @@ +Modified version of a C++ wrapper for the Gothic 2 Online API +Original: https://gitlab.com/g2o/modules/dependencies/nonut \ No newline at end of file diff --git a/src/NoNut/core/Array.h b/source/NoNut/include/Array.h similarity index 100% rename from src/NoNut/core/Array.h rename to source/NoNut/include/Array.h diff --git a/src/NoNut/core/Bind.h b/source/NoNut/include/Bind.h similarity index 100% rename from src/NoNut/core/Bind.h rename to source/NoNut/include/Bind.h diff --git a/src/NoNut/core/Class.h b/source/NoNut/include/Class.h similarity index 100% rename from src/NoNut/core/Class.h rename to source/NoNut/include/Class.h diff --git a/src/NoNut/core/CommonHeader.h b/source/NoNut/include/CommonHeader.h similarity index 100% rename from src/NoNut/core/CommonHeader.h rename to source/NoNut/include/CommonHeader.h diff --git a/src/NoNut/core/Constant.h b/source/NoNut/include/Constant.h similarity index 100% rename from src/NoNut/core/Constant.h rename to source/NoNut/include/Constant.h diff --git a/src/NoNut/core/CustomTypes.h b/source/NoNut/include/CustomTypes.h similarity index 100% rename from src/NoNut/core/CustomTypes.h rename to source/NoNut/include/CustomTypes.h diff --git a/src/NoNut/core/Function.h b/source/NoNut/include/Function.h similarity index 100% rename from src/NoNut/core/Function.h rename to source/NoNut/include/Function.h diff --git a/src/NoNut/core/Instance.h b/source/NoNut/include/Instance.h similarity index 100% rename from src/NoNut/core/Instance.h rename to source/NoNut/include/Instance.h diff --git a/src/NoNut/core/Property.h b/source/NoNut/include/Property.h similarity index 100% rename from src/NoNut/core/Property.h rename to source/NoNut/include/Property.h diff --git a/src/NoNut/core/StaticClass.h b/source/NoNut/include/StaticClass.h similarity index 100% rename from src/NoNut/core/StaticClass.h rename to source/NoNut/include/StaticClass.h diff --git a/src/NoNut/core/StringHelpers.h b/source/NoNut/include/StringHelpers.h similarity index 100% rename from src/NoNut/core/StringHelpers.h rename to source/NoNut/include/StringHelpers.h diff --git a/src/NoNut/core/Stringify.h b/source/NoNut/include/Stringify.h similarity index 100% rename from src/NoNut/core/Stringify.h rename to source/NoNut/include/Stringify.h diff --git a/src/NoNut/core/UserData.h b/source/NoNut/include/UserData.h similarity index 100% rename from src/NoNut/core/UserData.h rename to source/NoNut/include/UserData.h diff --git a/src/NoNut/core/Utils.h b/source/NoNut/include/Utils.h similarity index 100% rename from src/NoNut/core/Utils.h rename to source/NoNut/include/Utils.h diff --git a/src/NoNut/core/Array.cpp b/source/NoNut/source/Array.cpp similarity index 100% rename from src/NoNut/core/Array.cpp rename to source/NoNut/source/Array.cpp diff --git a/src/NoNut/core/Class.cpp b/source/NoNut/source/Class.cpp similarity index 100% rename from src/NoNut/core/Class.cpp rename to source/NoNut/source/Class.cpp diff --git a/src/NoNut/core/Constant.cpp b/source/NoNut/source/Constant.cpp similarity index 100% rename from src/NoNut/core/Constant.cpp rename to source/NoNut/source/Constant.cpp diff --git a/src/NoNut/core/CustomTypes.cpp b/source/NoNut/source/CustomTypes.cpp similarity index 100% rename from src/NoNut/core/CustomTypes.cpp rename to source/NoNut/source/CustomTypes.cpp diff --git a/src/NoNut/core/StaticClass.cpp b/source/NoNut/source/StaticClass.cpp similarity index 100% rename from src/NoNut/core/StaticClass.cpp rename to source/NoNut/source/StaticClass.cpp diff --git a/src/bind.cpp b/source/bind.cpp similarity index 97% rename from src/bind.cpp rename to source/bind.cpp index b2fef42..4a2ded5 100644 --- a/src/bind.cpp +++ b/source/bind.cpp @@ -1,17 +1,17 @@ #include -#include "classes/py/Packet.h" -#include "classes/py/DamageDescription.h" -#include "classes/py/ItemGround.h" -#include "classes/py/Daedalus.h" -#include "classes/py/Sky.h" -#include "classes/py/ItemsGround.h" -#include "classes/py/Mds.h" -#include "classes/py/Way.h" +#include "python/Packet.h" +#include "python/DamageDescription.h" +#include "python/ItemGround.h" +#include "python/Daedalus.h" +#include "python/Sky.h" +#include "python/ItemsGround.h" +#include "python/Mds.h" +#include "python/Way.h" -#include "functions/pyfunctions.h" +#include "python/functions.h" -#include +#include namespace py = pybind11; diff --git a/source/classes/CMakeLists.txt b/source/classes/CMakeLists.txt new file mode 100644 index 0000000..986c236 --- /dev/null +++ b/source/classes/CMakeLists.txt @@ -0,0 +1,17 @@ + +target_sources(${PYG2O_MODULE_NAME} + PRIVATE + squirrel/Daedalus.cpp + squirrel/DamageDescription.cpp + squirrel/ItemGround.cpp + squirrel/ItemsGround.cpp + squirrel/Mds.cpp + squirrel/Packet.cpp + squirrel/Sky.cpp + squirrel/Way.cpp +) + +target_include_directories(${PYG2O_MODULE_NAME} + PRIVATE + ${CMAKE_CURRENT_LIST_DIR}/ +) \ No newline at end of file diff --git a/src/classes/py/Daedalus.h b/source/classes/python/Daedalus.h similarity index 93% rename from src/classes/py/Daedalus.h rename to source/classes/python/Daedalus.h index 5682fac..8b2d58a 100644 --- a/src/classes/py/Daedalus.h +++ b/source/classes/python/Daedalus.h @@ -1,8 +1,9 @@ #ifndef _PYDAEDALUS_H_ #define _PYDAEDALUS_H_ -#include #include +#include "squirrel/Daedalus.h" + namespace py = pybind11; class PyDaedalus diff --git a/src/classes/py/DamageDescription.h b/source/classes/python/DamageDescription.h similarity index 97% rename from src/classes/py/DamageDescription.h rename to source/classes/python/DamageDescription.h index c9b9512..6050342 100644 --- a/src/classes/py/DamageDescription.h +++ b/source/classes/python/DamageDescription.h @@ -1,7 +1,7 @@ #ifndef _PYDAMAGEDESCRIPTION_H #define _PYDAMAGEDESCRIPTION_H -#include +#include "squirrel/DamageDescription.h" class PyDamageDescription { diff --git a/src/classes/py/ItemGround.h b/source/classes/python/ItemGround.h similarity index 97% rename from src/classes/py/ItemGround.h rename to source/classes/python/ItemGround.h index 249a309..b4c9325 100644 --- a/src/classes/py/ItemGround.h +++ b/source/classes/python/ItemGround.h @@ -2,7 +2,7 @@ #define _PY_ITEMGROUND_H_ #include -#include +#include "squirrel/ItemGround.h" namespace py = pybind11; diff --git a/src/classes/py/ItemsGround.h b/source/classes/python/ItemsGround.h similarity index 86% rename from src/classes/py/ItemsGround.h rename to source/classes/python/ItemsGround.h index 55f6fc3..7f97990 100644 --- a/src/classes/py/ItemsGround.h +++ b/source/classes/python/ItemsGround.h @@ -1,9 +1,9 @@ #ifndef _PYITEMSGROUND_H_ #define _PYITEMSGROUND_H_ -#include -#include -#include "../Dictionary.h" +#include "squirrel/ItemsGround.h" +#include "squirrel/ItemGround.h" +#include "Dictionary.h" class PyItemsGround { diff --git a/src/classes/py/Mds.h b/source/classes/python/Mds.h similarity index 91% rename from src/classes/py/Mds.h rename to source/classes/python/Mds.h index 88060c5..4408536 100644 --- a/src/classes/py/Mds.h +++ b/source/classes/python/Mds.h @@ -1,8 +1,8 @@ #ifndef _PYMDS_H #define _PYMDS_H -#include #include +#include "squirrel/Mds.h" namespace py = pybind11; class PyMds diff --git a/src/classes/py/Packet.h b/source/classes/python/Packet.h similarity index 98% rename from src/classes/py/Packet.h rename to source/classes/python/Packet.h index 209e5de..aec9487 100644 --- a/src/classes/py/Packet.h +++ b/source/classes/python/Packet.h @@ -1,7 +1,7 @@ #ifndef _PYPACKET_H_ #define _PYPACKET_H_ -#include +#include "squirrel/Packet.h" class PyPacket { diff --git a/src/classes/py/Sky.h b/source/classes/python/Sky.h similarity index 98% rename from src/classes/py/Sky.h rename to source/classes/python/Sky.h index 94dc030..82fdaad 100644 --- a/src/classes/py/Sky.h +++ b/source/classes/python/Sky.h @@ -1,8 +1,9 @@ #ifndef _PYSKY_H_ #define _PYSKY_H_ -#include #include +#include "squirrel/Sky.h" + namespace py = pybind11; class PySky diff --git a/src/classes/py/Way.h b/source/classes/python/Way.h similarity index 97% rename from src/classes/py/Way.h rename to source/classes/python/Way.h index 5ecc7a0..427be81 100644 --- a/src/classes/py/Way.h +++ b/source/classes/python/Way.h @@ -1,7 +1,7 @@ #ifndef _PYWAY_H_ #define _PYWAY_H_ -#include +#include "squirrel/Way.h" class PyWay { diff --git a/src/classes/sq/Daedalus.cpp b/source/classes/squirrel/Daedalus.cpp similarity index 88% rename from src/classes/sq/Daedalus.cpp rename to source/classes/squirrel/Daedalus.cpp index d954258..a75d0f6 100644 --- a/src/classes/sq/Daedalus.cpp +++ b/source/classes/squirrel/Daedalus.cpp @@ -1,4 +1,4 @@ -#include +#include #include "Daedalus.h" namespace nonut diff --git a/src/classes/sq/Daedalus.h b/source/classes/squirrel/Daedalus.h similarity index 84% rename from src/classes/sq/Daedalus.h rename to source/classes/squirrel/Daedalus.h index 6c6145b..45bab05 100644 --- a/src/classes/sq/Daedalus.h +++ b/source/classes/squirrel/Daedalus.h @@ -2,8 +2,8 @@ #define _DAEDALUS_H_ #include -#include -#include +#include +#include namespace nonut { diff --git a/src/classes/sq/DamageDescription.cpp b/source/classes/squirrel/DamageDescription.cpp similarity index 90% rename from src/classes/sq/DamageDescription.cpp rename to source/classes/squirrel/DamageDescription.cpp index 20500fd..4c6cf7f 100644 --- a/src/classes/sq/DamageDescription.cpp +++ b/source/classes/squirrel/DamageDescription.cpp @@ -1,4 +1,4 @@ -#include +#include "CommonHeader.h" #include "DamageDescription.h" namespace nonut diff --git a/src/classes/sq/DamageDescription.h b/source/classes/squirrel/DamageDescription.h similarity index 86% rename from src/classes/sq/DamageDescription.h rename to source/classes/squirrel/DamageDescription.h index 1f31071..763a02d 100644 --- a/src/classes/sq/DamageDescription.h +++ b/source/classes/squirrel/DamageDescription.h @@ -2,8 +2,8 @@ #define _DAMAGEDESCRIPTION_H_ #include -#include -#include +#include +#include namespace nonut { diff --git a/src/classes/sq/ItemGround.cpp b/source/classes/squirrel/ItemGround.cpp similarity index 89% rename from src/classes/sq/ItemGround.cpp rename to source/classes/squirrel/ItemGround.cpp index f21dc36..5f8fcc9 100644 --- a/src/classes/sq/ItemGround.cpp +++ b/source/classes/squirrel/ItemGround.cpp @@ -1,4 +1,4 @@ -#include +#include #include "ItemGround.h" namespace nonut diff --git a/src/classes/sq/ItemGround.h b/source/classes/squirrel/ItemGround.h similarity index 87% rename from src/classes/sq/ItemGround.h rename to source/classes/squirrel/ItemGround.h index 29343b1..1f4e406 100644 --- a/src/classes/sq/ItemGround.h +++ b/source/classes/squirrel/ItemGround.h @@ -2,8 +2,8 @@ #define _ITEMGROUND_H #include -#include -#include +#include +#include namespace nonut { diff --git a/src/classes/sq/ItemsGround.cpp b/source/classes/squirrel/ItemsGround.cpp similarity index 89% rename from src/classes/sq/ItemsGround.cpp rename to source/classes/squirrel/ItemsGround.cpp index c214a69..d80f33e 100644 --- a/src/classes/sq/ItemsGround.cpp +++ b/source/classes/squirrel/ItemsGround.cpp @@ -1,4 +1,4 @@ -#include +#include #include "ItemsGround.h" namespace nonut diff --git a/src/classes/sq/ItemsGround.h b/source/classes/squirrel/ItemsGround.h similarity index 87% rename from src/classes/sq/ItemsGround.h rename to source/classes/squirrel/ItemsGround.h index 7ce3729..c8dd665 100644 --- a/src/classes/sq/ItemsGround.h +++ b/source/classes/squirrel/ItemsGround.h @@ -2,8 +2,8 @@ #define _ITEMSGROUND_H_ #include -#include -#include +#include +#include #include "ItemGround.h" #include namespace py = pybind11; diff --git a/src/classes/sq/Mds.cpp b/source/classes/squirrel/Mds.cpp similarity index 86% rename from src/classes/sq/Mds.cpp rename to source/classes/squirrel/Mds.cpp index c2fd464..e409d64 100644 --- a/src/classes/sq/Mds.cpp +++ b/source/classes/squirrel/Mds.cpp @@ -1,4 +1,4 @@ -#include +#include #include "Mds.h" namespace nonut diff --git a/src/classes/sq/Mds.h b/source/classes/squirrel/Mds.h similarity index 81% rename from src/classes/sq/Mds.h rename to source/classes/squirrel/Mds.h index c0a8e15..93fbb49 100644 --- a/src/classes/sq/Mds.h +++ b/source/classes/squirrel/Mds.h @@ -2,8 +2,8 @@ #define _MDS_H #include -#include -#include +#include +#include namespace nonut { diff --git a/src/classes/sq/Packet.cpp b/source/classes/squirrel/Packet.cpp similarity index 97% rename from src/classes/sq/Packet.cpp rename to source/classes/squirrel/Packet.cpp index 65d743a..3229606 100644 --- a/src/classes/sq/Packet.cpp +++ b/source/classes/squirrel/Packet.cpp @@ -1,4 +1,4 @@ -#include +#include #include "Packet.h" namespace nonut diff --git a/src/classes/sq/Packet.h b/source/classes/squirrel/Packet.h similarity index 93% rename from src/classes/sq/Packet.h rename to source/classes/squirrel/Packet.h index c9aad65..0cf0f74 100644 --- a/src/classes/sq/Packet.h +++ b/source/classes/squirrel/Packet.h @@ -2,8 +2,8 @@ #define _PACKET_H_ #include -#include -#include +#include +#include namespace nonut { diff --git a/src/classes/sq/Sky.cpp b/source/classes/squirrel/Sky.cpp similarity index 93% rename from src/classes/sq/Sky.cpp rename to source/classes/squirrel/Sky.cpp index 18d5381..0729bea 100644 --- a/src/classes/sq/Sky.cpp +++ b/source/classes/squirrel/Sky.cpp @@ -1,4 +1,4 @@ -#include +#include #include "Sky.h" namespace nonut diff --git a/src/classes/sq/Sky.h b/source/classes/squirrel/Sky.h similarity index 89% rename from src/classes/sq/Sky.h rename to source/classes/squirrel/Sky.h index 9f0bfbb..542cfee 100644 --- a/src/classes/sq/Sky.h +++ b/source/classes/squirrel/Sky.h @@ -2,8 +2,8 @@ #define _SKY_H_ #include -#include -#include +#include +#include namespace nonut { diff --git a/src/classes/sq/Way.cpp b/source/classes/squirrel/Way.cpp similarity index 92% rename from src/classes/sq/Way.cpp rename to source/classes/squirrel/Way.cpp index 34036d4..8541a3e 100644 --- a/src/classes/sq/Way.cpp +++ b/source/classes/squirrel/Way.cpp @@ -1,4 +1,4 @@ -#include +#include #include "Way.h" namespace nonut diff --git a/src/classes/sq/Way.h b/source/classes/squirrel/Way.h similarity index 83% rename from src/classes/sq/Way.h rename to source/classes/squirrel/Way.h index c1624c3..1a790d8 100644 --- a/src/classes/sq/Way.h +++ b/source/classes/squirrel/Way.h @@ -2,8 +2,8 @@ #define _WAY_H #include -#include -#include +#include +#include namespace nonut { diff --git a/source/constants/CMakeLists.txt b/source/constants/CMakeLists.txt new file mode 100644 index 0000000..8272207 --- /dev/null +++ b/source/constants/CMakeLists.txt @@ -0,0 +1,10 @@ + +target_sources(${PYG2O_MODULE_NAME} + PRIVATE + sqconstants.cpp +) + +target_include_directories(${PYG2O_MODULE_NAME} + PRIVATE + ${CMAKE_CURRENT_LIST_DIR}/ +) \ No newline at end of file diff --git a/src/constants/sqconstants.cpp b/source/constants/sqconstants.cpp similarity index 99% rename from src/constants/sqconstants.cpp rename to source/constants/sqconstants.cpp index 69bc266..ba3a4a0 100644 --- a/src/constants/sqconstants.cpp +++ b/source/constants/sqconstants.cpp @@ -1,6 +1,6 @@ #include #include -#include "events/sqevents.h" +#include "sqevents.h" #include "sqconstants.h" namespace py = pybind11; diff --git a/src/constants/sqconstants.h b/source/constants/sqconstants.h similarity index 100% rename from src/constants/sqconstants.h rename to source/constants/sqconstants.h diff --git a/source/dependencies/CMakeLists.txt b/source/dependencies/CMakeLists.txt new file mode 100644 index 0000000..045efab --- /dev/null +++ b/source/dependencies/CMakeLists.txt @@ -0,0 +1,13 @@ +add_subdirectory(sqapi) +add_subdirectory(pybind11) + +target_link_libraries(${PYG2O_MODULE_NAME} + PRIVATE + sqapi + pybind11::embed +) + +target_compile_definitions(${PYG2O_MODULE_NAME} + PRIVATE + SCRAT_EXPORT +) \ No newline at end of file diff --git a/source/dependencies/pybind11 b/source/dependencies/pybind11 new file mode 160000 index 0000000..15d9dae --- /dev/null +++ b/source/dependencies/pybind11 @@ -0,0 +1 @@ +Subproject commit 15d9dae14b148509f3e1e7a42d5b1260fffff3ad diff --git a/source/dependencies/sqapi b/source/dependencies/sqapi new file mode 160000 index 0000000..2ae81b0 --- /dev/null +++ b/source/dependencies/sqapi @@ -0,0 +1 @@ +Subproject commit 2ae81b0f2b78834172a3af9986d8cc2b0c0c1617 diff --git a/source/events/CMakeLists.txt b/source/events/CMakeLists.txt new file mode 100644 index 0000000..abb9fc3 --- /dev/null +++ b/source/events/CMakeLists.txt @@ -0,0 +1,16 @@ + + +target_sources(${PYG2O_MODULE_NAME} + PRIVATE + sqevents.cpp + sqevents_anticheat.cpp + sqevents_general.cpp + sqevents_network.cpp + sqevents_npc.cpp + sqevents_player.cpp +) + +target_include_directories(${PYG2O_MODULE_NAME} + PRIVATE + ${CMAKE_CURRENT_LIST_DIR}/ +) \ No newline at end of file diff --git a/src/events/sqevents.cpp b/source/events/sqevents.cpp similarity index 100% rename from src/events/sqevents.cpp rename to source/events/sqevents.cpp diff --git a/src/events/sqevents.h b/source/events/sqevents.h similarity index 100% rename from src/events/sqevents.h rename to source/events/sqevents.h diff --git a/src/events/sqevents_anticheat.cpp b/source/events/sqevents_anticheat.cpp similarity index 92% rename from src/events/sqevents_anticheat.cpp rename to source/events/sqevents_anticheat.cpp index dc96e6f..18323ba 100644 --- a/src/events/sqevents_anticheat.cpp +++ b/source/events/sqevents_anticheat.cpp @@ -1,6 +1,6 @@ #include #include -#include "NoNut/core/Utils.h" +#include #include "sqevents.h" SQInteger sq_onPlayerUseCheat(HSQUIRRELVM vm) diff --git a/src/events/sqevents_general.cpp b/source/events/sqevents_general.cpp similarity index 94% rename from src/events/sqevents_general.cpp rename to source/events/sqevents_general.cpp index b838f1c..8e75b07 100644 --- a/src/events/sqevents_general.cpp +++ b/source/events/sqevents_general.cpp @@ -1,7 +1,7 @@ #include #include -#include "NoNut/core/Utils.h" -#include "NoNut/core/CustomTypes.h" +#include +#include #include "sqevents.h" namespace py = pybind11; diff --git a/src/events/sqevents_network.cpp b/source/events/sqevents_network.cpp similarity index 88% rename from src/events/sqevents_network.cpp rename to source/events/sqevents_network.cpp index 0540306..f6316c1 100644 --- a/src/events/sqevents_network.cpp +++ b/source/events/sqevents_network.cpp @@ -1,7 +1,7 @@ #include #include -#include "NoNut/core/Utils.h" -#include +#include +#include "python/Packet.h" #include "sqevents.h" namespace py = pybind11; diff --git a/src/events/sqevents_npc.cpp b/source/events/sqevents_npc.cpp similarity index 98% rename from src/events/sqevents_npc.cpp rename to source/events/sqevents_npc.cpp index ae7e5a7..1dad12e 100644 --- a/src/events/sqevents_npc.cpp +++ b/source/events/sqevents_npc.cpp @@ -1,6 +1,6 @@ #include #include -#include "NoNut/core/Utils.h" +#include #include "sqevents.h" SQInteger sq_onNpcActionFinished(HSQUIRRELVM vm) diff --git a/src/events/sqevents_player.cpp b/source/events/sqevents_player.cpp similarity index 99% rename from src/events/sqevents_player.cpp rename to source/events/sqevents_player.cpp index 46ee2c1..a0dc26e 100644 --- a/src/events/sqevents_player.cpp +++ b/source/events/sqevents_player.cpp @@ -1,8 +1,8 @@ #include #include -#include "NoNut/core/Utils.h" -#include -#include +#include +#include "python/DamageDescription.h" +#include "python/ItemGround.h" #include "sqevents.h" namespace py = pybind11; diff --git a/source/functions/CMakeLists.txt b/source/functions/CMakeLists.txt new file mode 100644 index 0000000..6c28ba2 --- /dev/null +++ b/source/functions/CMakeLists.txt @@ -0,0 +1,11 @@ + +target_sources(${PYG2O_MODULE_NAME} + PRIVATE + python/functions.cpp + squirrel/functions.cpp +) + +target_include_directories(${PYG2O_MODULE_NAME} + PRIVATE + ${CMAKE_CURRENT_LIST_DIR}/ +) \ No newline at end of file diff --git a/src/functions/pyfunctions.cpp b/source/functions/python/functions.cpp similarity index 99% rename from src/functions/pyfunctions.cpp rename to source/functions/python/functions.cpp index e650975..f2f5363 100644 --- a/src/functions/pyfunctions.cpp +++ b/source/functions/python/functions.cpp @@ -1,9 +1,11 @@ #include #include -#include "pyfunctions.h" -#include "sqfunctions.h" -#include "classes/Dictionary.h" -#include +#include + +#include "python/functions.h" +#include "squirrel/functions.h" +#include "Dictionary.h" + namespace py = pybind11; #define SERVERFUNC nonut::ServerFunctions::getInstance() diff --git a/src/functions/pyfunctions.h b/source/functions/python/functions.h similarity index 100% rename from src/functions/pyfunctions.h rename to source/functions/python/functions.h diff --git a/src/functions/sqfunctions.cpp b/source/functions/squirrel/functions.cpp similarity index 99% rename from src/functions/sqfunctions.cpp rename to source/functions/squirrel/functions.cpp index c71a34c..a71e13b 100644 --- a/src/functions/sqfunctions.cpp +++ b/source/functions/squirrel/functions.cpp @@ -1,5 +1,5 @@ #include -#include "sqfunctions.h" +#include "squirrel/functions.h" namespace nonut { diff --git a/src/functions/sqfunctions.h b/source/functions/squirrel/functions.h similarity index 99% rename from src/functions/sqfunctions.h rename to source/functions/squirrel/functions.h index d76fb1a..c92d231 100644 --- a/src/functions/sqfunctions.h +++ b/source/functions/squirrel/functions.h @@ -1,8 +1,8 @@ #ifndef _SQFUNCTIONS_ #define _SQFUNCTIONS_ -#include -#include +#include +#include namespace nonut { diff --git a/src/main.cpp b/source/main.cpp similarity index 82% rename from src/main.cpp rename to source/main.cpp index c5ef662..0bae772 100644 --- a/src/main.cpp +++ b/source/main.cpp @@ -1,8 +1,8 @@ #include #include -#include "events/sqevents.h" -#include "constants/sqconstants.h" -#include "functions/sqfunctions.h" +#include "sqevents.h" +#include "sqconstants.h" +#include "squirrel/functions.h" namespace py = pybind11; py::scoped_interpreter guard{}; @@ -11,6 +11,12 @@ py::module_ pysys = py::module_::import("sys"); py::module_ g2o; py::module_ scripts; +int main() +{ + system("pause"); + return 0; +} + extern "C" SQRESULT SQRAT_API sqmodule_load(HSQUIRRELVM vm, HSQAPI api) { SqModule::Initialize(vm, api); diff --git a/source/types/CMakeLists.txt b/source/types/CMakeLists.txt new file mode 100644 index 0000000..e6305f6 --- /dev/null +++ b/source/types/CMakeLists.txt @@ -0,0 +1,10 @@ + +target_sources(${PYG2O_MODULE_NAME} + PRIVATE + Dictionary.cpp +) + +target_include_directories(${PYG2O_MODULE_NAME} + PRIVATE + ${CMAKE_CURRENT_LIST_DIR}/ +) \ No newline at end of file diff --git a/src/classes/Dictionary.cpp b/source/types/Dictionary.cpp similarity index 97% rename from src/classes/Dictionary.cpp rename to source/types/Dictionary.cpp index 30f0e30..268cb92 100644 --- a/src/classes/Dictionary.cpp +++ b/source/types/Dictionary.cpp @@ -1,10 +1,10 @@ #include #include +#include #include "Dictionary.h" -#include -namespace py = pybind11; +namespace py = pybind11; Sqrat::Table* PyDictionary::toSqObject(py::dict value) { diff --git a/src/classes/Dictionary.h b/source/types/Dictionary.h similarity index 100% rename from src/classes/Dictionary.h rename to source/types/Dictionary.h