diff --git a/.env b/.env index 12a77a4..3451f36 100644 --- a/.env +++ b/.env @@ -1,9 +1,8 @@ -MINECRAFTD_PASSWORD="J526lGJOUZlppuMYQNJXQIvimiBZ1gViXD/lLQ=="" -PID_FILE="/srv/retards-server/minecraftd/server.pid" -START_COMMAND="bash /srv/retards-server/data/start.sh" +MINECRAFTD_PASSWORD="poteredellafiga12345678" +START_COMMAND="bash /srv/retards-server/server/start.sh" SERVER_HOST="localhost" SERVER_PORT="25565" SERVER_RCON_PASSWORD="abcdc37ab1ae48056130338c" SERVER_RCON_PORT="25575" MAINTAINANCE_FILE="/srv/retards-server/minecraftd/maintainance.txt" -LOG_FILE="/srv/retards-server/data/logs/latest.log" +LOG_FILE="/srv/retards-server/server/logs/latest.log" diff --git a/__main__.py b/__main__.py new file mode 100644 index 0000000..f1adf01 --- /dev/null +++ b/__main__.py @@ -0,0 +1,3 @@ +import main + +main.run() diff --git a/__pycache__/classes.cpython-311.pyc b/__pycache__/classes.cpython-311.pyc index 52e548e..e72dbc2 100644 Binary files a/__pycache__/classes.cpython-311.pyc and b/__pycache__/classes.cpython-311.pyc differ diff --git a/__pycache__/config.cpython-311.pyc b/__pycache__/config.cpython-311.pyc index 4cdf2e3..be2491f 100644 Binary files a/__pycache__/config.cpython-311.pyc and b/__pycache__/config.cpython-311.pyc differ diff --git a/__pycache__/controllers.cpython-311.pyc b/__pycache__/controllers.cpython-311.pyc index b9041cd..1020b1c 100644 Binary files a/__pycache__/controllers.cpython-311.pyc and b/__pycache__/controllers.cpython-311.pyc differ diff --git a/__pycache__/main.cpython-311.pyc b/__pycache__/main.cpython-311.pyc index b8913dc..9e01065 100644 Binary files a/__pycache__/main.cpython-311.pyc and b/__pycache__/main.cpython-311.pyc differ diff --git a/__pycache__/util.cpython-311.pyc b/__pycache__/util.cpython-311.pyc index f05c875..77cf9c2 100644 Binary files a/__pycache__/util.cpython-311.pyc and b/__pycache__/util.cpython-311.pyc differ diff --git a/controllers.py b/controllers.py index 895cb56..0ae39f6 100644 --- a/controllers.py +++ b/controllers.py @@ -8,8 +8,8 @@ from typing import Generator, Literal from mcrcon import MCRcon from mcstatus import JavaServer -from .classes import ProcessStatus, ServerStatus -from .config import Config +from classes import ProcessStatus, ServerStatus +from config import Config class ProcessController: diff --git a/main.py b/main.py index e8faa57..7a6ab88 100644 --- a/main.py +++ b/main.py @@ -4,11 +4,13 @@ from typing import Annotated from fastapi import FastAPI, Header from fastapi.responses import StreamingResponse -from .classes import ProcessStatus -from .controllers import Controllers -from .models import Models -from .responses import Responses -from .util import check_password, stop_server +from classes import ProcessStatus +from controllers import Controllers +from models import Models +from responses import Responses +from util import check_password, stop_server + +import uvicorn app = FastAPI() @@ -120,3 +122,7 @@ async def logs_tail( ) -> StreamingResponse: check_password(authorization) return StreamingResponse(Controllers.logs.tail(data.back)) + + +if __name__ == "__main__": + uvicorn.run("main:app", host="0.0.0.0", port=42101) diff --git a/util.py b/util.py index 7a1588f..af23be6 100644 --- a/util.py +++ b/util.py @@ -3,10 +3,10 @@ from typing import Callable from fastapi import HTTPException -from minecraftd.classes import ProcessStatus +from classes import ProcessStatus -from .config import Config -from .controllers import Controllers +from config import Config +from controllers import Controllers async def stop_server(