From 6d7b5070c5afa1ff95ebd8f7863e196721c38427 Mon Sep 17 00:00:00 2001 From: TheFamiliarScoot <19767826+TheFamiliarScoot@users.noreply.github.com> Date: Fri, 30 Jul 2021 17:27:31 -0400 Subject: [PATCH 1/3] vs code tasks cool B) --- .gitignore | 1 + .vscode/darwin/start-ai-server.sh | 12 ++++ .vscode/darwin/start-astron-server.sh | 4 ++ .vscode/darwin/start-game.sh | 4 ++ .vscode/darwin/start-uberdog-server.sh | 11 +++ .vscode/linux/start-ai-server.sh | 12 ++++ .vscode/linux/start-astron-server.sh | 6 ++ .vscode/linux/start-game.sh | 4 ++ .vscode/linux/start-uberdog-server.sh | 11 +++ .vscode/tasks.json | 99 ++++++++++++++++++++++++++ .vscode/win32/start_ai_server.bat | 11 +++ .vscode/win32/start_astron_server.bat | 3 + .vscode/win32/start_game.bat | 7 ++ .vscode/win32/start_uberdog_server.bat | 9 +++ 14 files changed, 194 insertions(+) create mode 100644 .vscode/darwin/start-ai-server.sh create mode 100644 .vscode/darwin/start-astron-server.sh create mode 100644 .vscode/darwin/start-game.sh create mode 100644 .vscode/darwin/start-uberdog-server.sh create mode 100644 .vscode/linux/start-ai-server.sh create mode 100644 .vscode/linux/start-astron-server.sh create mode 100644 .vscode/linux/start-game.sh create mode 100644 .vscode/linux/start-uberdog-server.sh create mode 100644 .vscode/tasks.json create mode 100644 .vscode/win32/start_ai_server.bat create mode 100644 .vscode/win32/start_astron_server.bat create mode 100644 .vscode/win32/start_game.bat create mode 100644 .vscode/win32/start_uberdog_server.bat diff --git a/.gitignore b/.gitignore index dacef3a..c861623 100644 --- a/.gitignore +++ b/.gitignore @@ -12,6 +12,7 @@ whitelist/ .idea venv/ *.json +!.vscode/tasks.json *.buildings *.trackRecords PPYTHON_PATH diff --git a/.vscode/darwin/start-ai-server.sh b/.vscode/darwin/start-ai-server.sh new file mode 100644 index 0000000..916fc92 --- /dev/null +++ b/.vscode/darwin/start-ai-server.sh @@ -0,0 +1,12 @@ +#!/bin/sh +BASE_CHANNEL=401000000 +MAX_CHANNELS=999999 +STATE_SERVER=4002 +MESSAGE_DIRECTOR_IP="127.0.0.1:7199" +EVENT_LOGGER_IP="127.0.0.1:7197" +DISTRICT_NAME="Toon Valley" + +/usr/local/bin/python3.9 -m toontown.ai.AIStart --base-channel ${BASE_CHANNEL} \ + --max-channels ${MAX_CHANNELS} --stateserver ${STATE_SERVER} \ + --messagedirector-ip ${MESSAGE_DIRECTOR_IP} \ + --eventlogger-ip ${EVENT_LOGGER_IP} --district-name "$DISTRICT_NAME" diff --git a/.vscode/darwin/start-astron-server.sh b/.vscode/darwin/start-astron-server.sh new file mode 100644 index 0000000..4fe8a26 --- /dev/null +++ b/.vscode/darwin/start-astron-server.sh @@ -0,0 +1,4 @@ +#!/bin/sh +# This assumes that your astrond build is located in the +# "astron/darwin" directory. +./astrond --loglevel info ../config/astrond.yml diff --git a/.vscode/darwin/start-game.sh b/.vscode/darwin/start-game.sh new file mode 100644 index 0000000..95f2e3f --- /dev/null +++ b/.vscode/darwin/start-game.sh @@ -0,0 +1,4 @@ +#!/bin/sh +export LOGIN_TOKEN=dev + +/usr/local/bin/python3.9 -m toontown.launcher.QuickStartLauncher diff --git a/.vscode/darwin/start-uberdog-server.sh b/.vscode/darwin/start-uberdog-server.sh new file mode 100644 index 0000000..1e05618 --- /dev/null +++ b/.vscode/darwin/start-uberdog-server.sh @@ -0,0 +1,11 @@ +#!/bin/sh +MAX_CHANNELS=999999 +STATE_SERVER=4002 +MESSAGE_DIRECTOR_IP="127.0.0.1:7199" +EVENT_LOGGER_IP="127.0.0.1:7197" +BASE_CHANNEL=1000000 + +/usr/local/bin/python3.9 -m toontown.uberdog.UDStart --base-channel ${BASE_CHANNEL} \ + --max-channels ${MAX_CHANNELS} --stateserver ${STATE_SERVER} \ + --messagedirector-ip ${MESSAGE_DIRECTOR_IP} \ + --eventlogger-ip ${EVENT_LOGGER_IP} diff --git a/.vscode/linux/start-ai-server.sh b/.vscode/linux/start-ai-server.sh new file mode 100644 index 0000000..c9d456d --- /dev/null +++ b/.vscode/linux/start-ai-server.sh @@ -0,0 +1,12 @@ +#!/bin/sh +BASE_CHANNEL=401000000 +MAX_CHANNELS=999999 +STATE_SERVER=4002 +MESSAGE_DIRECTOR_IP="127.0.0.1:7199" +EVENT_LOGGER_IP="127.0.0.1:7197" +DISTRICT_NAME="Toon Valley" + +python3 -m toontown.ai.AIStart --base-channel ${BASE_CHANNEL} \ + --max-channels ${MAX_CHANNELS} --stateserver ${STATE_SERVER} \ + --messagedirector-ip ${MESSAGE_DIRECTOR_IP} \ + --eventlogger-ip ${EVENT_LOGGER_IP} --district-name "$DISTRICT_NAME" diff --git a/.vscode/linux/start-astron-server.sh b/.vscode/linux/start-astron-server.sh new file mode 100644 index 0000000..5ec5fcf --- /dev/null +++ b/.vscode/linux/start-astron-server.sh @@ -0,0 +1,6 @@ +#!/bin/sh +cd /astron/linux + +# This assumes that your astrond build is located in the +# "astron/linux" directory. +./astrond --loglevel info ../config/astrond.yml diff --git a/.vscode/linux/start-game.sh b/.vscode/linux/start-game.sh new file mode 100644 index 0000000..f00afea --- /dev/null +++ b/.vscode/linux/start-game.sh @@ -0,0 +1,4 @@ +#!/bin/sh +export LOGIN_TOKEN=dev + +python3 -m toontown.launcher.QuickStartLauncher diff --git a/.vscode/linux/start-uberdog-server.sh b/.vscode/linux/start-uberdog-server.sh new file mode 100644 index 0000000..2a5e232 --- /dev/null +++ b/.vscode/linux/start-uberdog-server.sh @@ -0,0 +1,11 @@ +#!/bin/sh +MAX_CHANNELS=999999 +STATE_SERVER=4002 +MESSAGE_DIRECTOR_IP="127.0.0.1:7199" +EVENT_LOGGER_IP="127.0.0.1:7197" +BASE_CHANNEL=1000000 + +python3 -m toontown.uberdog.UDStart --base-channel ${BASE_CHANNEL} \ + --max-channels ${MAX_CHANNELS} --stateserver ${STATE_SERVER} \ + --messagedirector-ip ${MESSAGE_DIRECTOR_IP} \ + --eventlogger-ip ${EVENT_LOGGER_IP} diff --git a/.vscode/tasks.json b/.vscode/tasks.json new file mode 100644 index 0000000..2076fb7 --- /dev/null +++ b/.vscode/tasks.json @@ -0,0 +1,99 @@ +{ + // See https://go.microsoft.com/fwlink/?LinkId=733558 + // for the documentation about the tasks.json format + "version": "2.0.0", + "tasks": [ + { + "label": "Start Game", + "type": "shell", + "command": "./.vscode/linux/start_game.sh", + "windows": { + "command": ".\\.vscode\\win32\\start_game.bat" + }, + "group": "test", + "presentation": { + "reveal": "always", + "panel": "new" + } + }, + { + "label": "Start Game (Darwin)", + "type": "shell", + "command": "./.vscode/darwin/start_game.sh", + "group": "test", + "presentation": { + "reveal": "always", + "panel": "new" + } + }, + { + "label": "Start AI Server", + "type": "shell", + "command": "./.vscode/linux/start_ai_server.sh", + "windows": { + "command": ".\\.vscode\\win32\\start_ai_server.bat" + }, + "group": "test", + "presentation": { + "reveal": "always", + "panel": "new" + } + }, + { + "label": "Start AI Server (Darwin)", + "type": "shell", + "command": "./.vscode/darwin/start_ai_server.sh", + "group": "test", + "presentation": { + "reveal": "always", + "panel": "new" + } + }, + { + "label": "Start Astron Server", + "type": "shell", + "command": "./.vscode/linux/start_astron_server.sh", + "windows": { + "command": ".\\.vscode\\win32\\start_astron_server.bat" + }, + "group": "test", + "presentation": { + "reveal": "always", + "panel": "new" + } + }, + { + "label": "Start Astron Server (Darwin)", + "type": "shell", + "command": "./.vscode/darwin/start_astron_server.sh", + "group": "test", + "presentation": { + "reveal": "always", + "panel": "new" + } + }, + { + "label": "Start UberDOG Server", + "type": "shell", + "command": "./.vscode/linux/start_uberdog_server.sh", + "windows": { + "command": ".\\.vscode\\win32\\start_uberdog_server.bat" + }, + "group": "test", + "presentation": { + "reveal": "always", + "panel": "new" + } + }, + { + "label": "Start UberDOG Server (Darwin)", + "type": "shell", + "command": "./.vscode/darwin/start_uberdog_server.sh", + "group": "test", + "presentation": { + "reveal": "always", + "panel": "new" + } + } + ] + } \ No newline at end of file diff --git a/.vscode/win32/start_ai_server.bat b/.vscode/win32/start_ai_server.bat new file mode 100644 index 0000000..81f8251 --- /dev/null +++ b/.vscode/win32/start_ai_server.bat @@ -0,0 +1,11 @@ +@echo off +rem Read the contents of PPYTHON_PATH into %PPYTHON_PATH%: +set /P PPYTHON_PATH= Date: Fri, 30 Jul 2021 22:47:38 -0400 Subject: [PATCH 2/3] general: new vsc tasks method added a workspace for tasks relying on the existing scripts --- .gitignore | 4 +- .vscode/darwin/start-ai-server.sh | 12 ---- .vscode/darwin/start-astron-server.sh | 4 -- .vscode/darwin/start-game.sh | 4 -- .vscode/darwin/start-uberdog-server.sh | 11 --- .vscode/linux/start-ai-server.sh | 12 ---- .vscode/linux/start-astron-server.sh | 6 -- .vscode/linux/start-game.sh | 4 -- .vscode/linux/start-uberdog-server.sh | 11 --- .vscode/tasks.json | 99 -------------------------- .vscode/win32/start_ai_server.bat | 11 --- .vscode/win32/start_astron_server.bat | 3 - .vscode/win32/start_game.bat | 7 -- .vscode/win32/start_uberdog_server.bat | 9 --- darwin/.vscode/tasks.json | 47 ++++++++++++ linux/.vscode/tasks.json | 47 ++++++++++++ vscode.code-workspace | 20 ++++++ win32/.vscode/tasks.json | 47 ++++++++++++ 18 files changed, 164 insertions(+), 194 deletions(-) delete mode 100644 .vscode/darwin/start-ai-server.sh delete mode 100644 .vscode/darwin/start-astron-server.sh delete mode 100644 .vscode/darwin/start-game.sh delete mode 100644 .vscode/darwin/start-uberdog-server.sh delete mode 100644 .vscode/linux/start-ai-server.sh delete mode 100644 .vscode/linux/start-astron-server.sh delete mode 100644 .vscode/linux/start-game.sh delete mode 100644 .vscode/linux/start-uberdog-server.sh delete mode 100644 .vscode/tasks.json delete mode 100644 .vscode/win32/start_ai_server.bat delete mode 100644 .vscode/win32/start_astron_server.bat delete mode 100644 .vscode/win32/start_game.bat delete mode 100644 .vscode/win32/start_uberdog_server.bat create mode 100644 darwin/.vscode/tasks.json create mode 100644 linux/.vscode/tasks.json create mode 100644 vscode.code-workspace create mode 100644 win32/.vscode/tasks.json diff --git a/.gitignore b/.gitignore index c861623..fad4562 100644 --- a/.gitignore +++ b/.gitignore @@ -12,7 +12,9 @@ whitelist/ .idea venv/ *.json -!.vscode/tasks.json +!win32/.vscode/tasks.json +!linux/.vscode/tasks.json +!darwin/.vscode/tasks.json *.buildings *.trackRecords PPYTHON_PATH diff --git a/.vscode/darwin/start-ai-server.sh b/.vscode/darwin/start-ai-server.sh deleted file mode 100644 index 916fc92..0000000 --- a/.vscode/darwin/start-ai-server.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh -BASE_CHANNEL=401000000 -MAX_CHANNELS=999999 -STATE_SERVER=4002 -MESSAGE_DIRECTOR_IP="127.0.0.1:7199" -EVENT_LOGGER_IP="127.0.0.1:7197" -DISTRICT_NAME="Toon Valley" - -/usr/local/bin/python3.9 -m toontown.ai.AIStart --base-channel ${BASE_CHANNEL} \ - --max-channels ${MAX_CHANNELS} --stateserver ${STATE_SERVER} \ - --messagedirector-ip ${MESSAGE_DIRECTOR_IP} \ - --eventlogger-ip ${EVENT_LOGGER_IP} --district-name "$DISTRICT_NAME" diff --git a/.vscode/darwin/start-astron-server.sh b/.vscode/darwin/start-astron-server.sh deleted file mode 100644 index 4fe8a26..0000000 --- a/.vscode/darwin/start-astron-server.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -# This assumes that your astrond build is located in the -# "astron/darwin" directory. -./astrond --loglevel info ../config/astrond.yml diff --git a/.vscode/darwin/start-game.sh b/.vscode/darwin/start-game.sh deleted file mode 100644 index 95f2e3f..0000000 --- a/.vscode/darwin/start-game.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -export LOGIN_TOKEN=dev - -/usr/local/bin/python3.9 -m toontown.launcher.QuickStartLauncher diff --git a/.vscode/darwin/start-uberdog-server.sh b/.vscode/darwin/start-uberdog-server.sh deleted file mode 100644 index 1e05618..0000000 --- a/.vscode/darwin/start-uberdog-server.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -MAX_CHANNELS=999999 -STATE_SERVER=4002 -MESSAGE_DIRECTOR_IP="127.0.0.1:7199" -EVENT_LOGGER_IP="127.0.0.1:7197" -BASE_CHANNEL=1000000 - -/usr/local/bin/python3.9 -m toontown.uberdog.UDStart --base-channel ${BASE_CHANNEL} \ - --max-channels ${MAX_CHANNELS} --stateserver ${STATE_SERVER} \ - --messagedirector-ip ${MESSAGE_DIRECTOR_IP} \ - --eventlogger-ip ${EVENT_LOGGER_IP} diff --git a/.vscode/linux/start-ai-server.sh b/.vscode/linux/start-ai-server.sh deleted file mode 100644 index c9d456d..0000000 --- a/.vscode/linux/start-ai-server.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh -BASE_CHANNEL=401000000 -MAX_CHANNELS=999999 -STATE_SERVER=4002 -MESSAGE_DIRECTOR_IP="127.0.0.1:7199" -EVENT_LOGGER_IP="127.0.0.1:7197" -DISTRICT_NAME="Toon Valley" - -python3 -m toontown.ai.AIStart --base-channel ${BASE_CHANNEL} \ - --max-channels ${MAX_CHANNELS} --stateserver ${STATE_SERVER} \ - --messagedirector-ip ${MESSAGE_DIRECTOR_IP} \ - --eventlogger-ip ${EVENT_LOGGER_IP} --district-name "$DISTRICT_NAME" diff --git a/.vscode/linux/start-astron-server.sh b/.vscode/linux/start-astron-server.sh deleted file mode 100644 index 5ec5fcf..0000000 --- a/.vscode/linux/start-astron-server.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh -cd /astron/linux - -# This assumes that your astrond build is located in the -# "astron/linux" directory. -./astrond --loglevel info ../config/astrond.yml diff --git a/.vscode/linux/start-game.sh b/.vscode/linux/start-game.sh deleted file mode 100644 index f00afea..0000000 --- a/.vscode/linux/start-game.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -export LOGIN_TOKEN=dev - -python3 -m toontown.launcher.QuickStartLauncher diff --git a/.vscode/linux/start-uberdog-server.sh b/.vscode/linux/start-uberdog-server.sh deleted file mode 100644 index 2a5e232..0000000 --- a/.vscode/linux/start-uberdog-server.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -MAX_CHANNELS=999999 -STATE_SERVER=4002 -MESSAGE_DIRECTOR_IP="127.0.0.1:7199" -EVENT_LOGGER_IP="127.0.0.1:7197" -BASE_CHANNEL=1000000 - -python3 -m toontown.uberdog.UDStart --base-channel ${BASE_CHANNEL} \ - --max-channels ${MAX_CHANNELS} --stateserver ${STATE_SERVER} \ - --messagedirector-ip ${MESSAGE_DIRECTOR_IP} \ - --eventlogger-ip ${EVENT_LOGGER_IP} diff --git a/.vscode/tasks.json b/.vscode/tasks.json deleted file mode 100644 index 2076fb7..0000000 --- a/.vscode/tasks.json +++ /dev/null @@ -1,99 +0,0 @@ -{ - // See https://go.microsoft.com/fwlink/?LinkId=733558 - // for the documentation about the tasks.json format - "version": "2.0.0", - "tasks": [ - { - "label": "Start Game", - "type": "shell", - "command": "./.vscode/linux/start_game.sh", - "windows": { - "command": ".\\.vscode\\win32\\start_game.bat" - }, - "group": "test", - "presentation": { - "reveal": "always", - "panel": "new" - } - }, - { - "label": "Start Game (Darwin)", - "type": "shell", - "command": "./.vscode/darwin/start_game.sh", - "group": "test", - "presentation": { - "reveal": "always", - "panel": "new" - } - }, - { - "label": "Start AI Server", - "type": "shell", - "command": "./.vscode/linux/start_ai_server.sh", - "windows": { - "command": ".\\.vscode\\win32\\start_ai_server.bat" - }, - "group": "test", - "presentation": { - "reveal": "always", - "panel": "new" - } - }, - { - "label": "Start AI Server (Darwin)", - "type": "shell", - "command": "./.vscode/darwin/start_ai_server.sh", - "group": "test", - "presentation": { - "reveal": "always", - "panel": "new" - } - }, - { - "label": "Start Astron Server", - "type": "shell", - "command": "./.vscode/linux/start_astron_server.sh", - "windows": { - "command": ".\\.vscode\\win32\\start_astron_server.bat" - }, - "group": "test", - "presentation": { - "reveal": "always", - "panel": "new" - } - }, - { - "label": "Start Astron Server (Darwin)", - "type": "shell", - "command": "./.vscode/darwin/start_astron_server.sh", - "group": "test", - "presentation": { - "reveal": "always", - "panel": "new" - } - }, - { - "label": "Start UberDOG Server", - "type": "shell", - "command": "./.vscode/linux/start_uberdog_server.sh", - "windows": { - "command": ".\\.vscode\\win32\\start_uberdog_server.bat" - }, - "group": "test", - "presentation": { - "reveal": "always", - "panel": "new" - } - }, - { - "label": "Start UberDOG Server (Darwin)", - "type": "shell", - "command": "./.vscode/darwin/start_uberdog_server.sh", - "group": "test", - "presentation": { - "reveal": "always", - "panel": "new" - } - } - ] - } \ No newline at end of file diff --git a/.vscode/win32/start_ai_server.bat b/.vscode/win32/start_ai_server.bat deleted file mode 100644 index 81f8251..0000000 --- a/.vscode/win32/start_ai_server.bat +++ /dev/null @@ -1,11 +0,0 @@ -@echo off -rem Read the contents of PPYTHON_PATH into %PPYTHON_PATH%: -set /P PPYTHON_PATH= Date: Fri, 30 Jul 2021 23:15:41 -0400 Subject: [PATCH 3/3] general: more vsc stuff added some file exclusions so the workspace looks a bit cleaner --- vscode.code-workspace | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/vscode.code-workspace b/vscode.code-workspace index b9fcf60..18db2f1 100644 --- a/vscode.code-workspace +++ b/vscode.code-workspace @@ -16,5 +16,21 @@ "name": "Darwin Scripts", "path": "darwin" } - ] + ], + "settings": { + "files.exclude": { + "**/__pycache__": true, + "**/.idea": true, + "**/.pyc,**/*.pyo,**/*.pyd": true, + "**/*_buildings.json": true, + "**/darwin": true, + "**/errorCode": true, + "**/linux": true, + "**/news": true, + "**/resources": true, + "**/sign": true, + "**/whitelist": true, + "**/win32": true + } + } } \ No newline at end of file