From 4c98b40874ef3b6daf96e984c828c1404c21fb20 Mon Sep 17 00:00:00 2001
From: Bitl <bitlblox@gmail.com>
Date: Fri, 6 Jan 2023 12:30:46 -0700
Subject: [PATCH] move addons to defaultaddons folder

---
 .../Addon_Template.lua                        |  0
 .../ServerWhitelist.lua                       |  0
 .../ShadersCompatibility.lua                  |  0
 Utils.lua => defaultaddons/Utils.lua          |  0
 .../core/AddonLoader.lua                      |  0
 .../novetusexts/webproxy/Asset.cs             |  0
 .../novetusexts/webproxy/StudioLaunchPage.cs  |  0
 .../novetusexts/webproxy/UploadWarnings.cs    |  0
 scripts/batch/github_sync.bat                 | 29 ++++++++++++-------
 9 files changed, 18 insertions(+), 11 deletions(-)
 rename Addon_Template.lua => defaultaddons/Addon_Template.lua (100%)
 rename ServerWhitelist.lua => defaultaddons/ServerWhitelist.lua (100%)
 rename ShadersCompatibility.lua => defaultaddons/ShadersCompatibility.lua (100%)
 rename Utils.lua => defaultaddons/Utils.lua (100%)
 rename AddonLoader.lua => defaultaddons/core/AddonLoader.lua (100%)
 rename Asset.cs => defaultaddons/novetusexts/webproxy/Asset.cs (100%)
 rename StudioLaunchPage.cs => defaultaddons/novetusexts/webproxy/StudioLaunchPage.cs (100%)
 rename UploadWarnings.cs => defaultaddons/novetusexts/webproxy/UploadWarnings.cs (100%)

diff --git a/Addon_Template.lua b/defaultaddons/Addon_Template.lua
similarity index 100%
rename from Addon_Template.lua
rename to defaultaddons/Addon_Template.lua
diff --git a/ServerWhitelist.lua b/defaultaddons/ServerWhitelist.lua
similarity index 100%
rename from ServerWhitelist.lua
rename to defaultaddons/ServerWhitelist.lua
diff --git a/ShadersCompatibility.lua b/defaultaddons/ShadersCompatibility.lua
similarity index 100%
rename from ShadersCompatibility.lua
rename to defaultaddons/ShadersCompatibility.lua
diff --git a/Utils.lua b/defaultaddons/Utils.lua
similarity index 100%
rename from Utils.lua
rename to defaultaddons/Utils.lua
diff --git a/AddonLoader.lua b/defaultaddons/core/AddonLoader.lua
similarity index 100%
rename from AddonLoader.lua
rename to defaultaddons/core/AddonLoader.lua
diff --git a/Asset.cs b/defaultaddons/novetusexts/webproxy/Asset.cs
similarity index 100%
rename from Asset.cs
rename to defaultaddons/novetusexts/webproxy/Asset.cs
diff --git a/StudioLaunchPage.cs b/defaultaddons/novetusexts/webproxy/StudioLaunchPage.cs
similarity index 100%
rename from StudioLaunchPage.cs
rename to defaultaddons/novetusexts/webproxy/StudioLaunchPage.cs
diff --git a/UploadWarnings.cs b/defaultaddons/novetusexts/webproxy/UploadWarnings.cs
similarity index 100%
rename from UploadWarnings.cs
rename to defaultaddons/novetusexts/webproxy/UploadWarnings.cs
diff --git a/scripts/batch/github_sync.bat b/scripts/batch/github_sync.bat
index 517bd9d..52fb69f 100644
--- a/scripts/batch/github_sync.bat
+++ b/scripts/batch/github_sync.bat
@@ -1,6 +1,6 @@
 @ECHO OFF
 
-SET debug=0
+SET debug=1
 SET basedir=%CD%\scripts
 
 SET gamescriptdir=%basedir%\game
@@ -138,6 +138,23 @@ if not exist "%scriptsdir%" mkdir "%scriptsdir%"
 XCOPY /E "%basedir%" "%scriptsdir%" /sy
 rmdir "%basedir%" /s /q
 
+echo.
+echo Moving default addons and extensions...
+SET addonsdir=%dest%\defaultaddons
+if not exist "%addonsdir%" mkdir "%addonsdir%"
+XCOPY "%cd%\Novetus\addons\*.lua" "%addonsdir%" /y
+
+SET addonscoredir=%addonsdir%\core
+if not exist "%addonscoredir%" mkdir "%addonscoredir%"
+XCOPY "%cd%\Novetus\addons\core\AddonLoader.lua" "%addonscoredir%" /y
+
+SET extfolder=%addonsdir%\novetusexts
+if not exist "%extfolder%" mkdir "%extfolder%"
+
+SET extwebproxyfolder=%extfolder%\webproxy
+if not exist "%extwebproxyfolder%" mkdir "%extwebproxyfolder%"
+XCOPY "%cd%\Novetus\addons\novetusexts\webproxy\*.cs" "%extwebproxyfolder%" /sy
+
 echo.
 echo Coying additional files to GitHub folder...
 if not exist "%dest%\scripts\batch" mkdir "%scriptsdir%\batch"
@@ -156,14 +173,4 @@ XCOPY "%cd%\Novetus\changelog.txt" "%dest%\changelog.txt" /y
 XCOPY "%cd%\Novetus\LICENSE.txt" "%dest%\LICENSE" /y
 XCOPY "%cd%\Novetus\LICENSE-RESHADE.txt" "%dest%\LICENSE-RESHADE" /y
 XCOPY "%cd%\Novetus\README-AND-CREDITS.TXT" "%dest%" /y
-XCOPY "%cd%\Novetus\addons\Addon_Template.lua" "%dest%" /y
-XCOPY "%cd%\Novetus\addons\Utils.lua" "%dest%" /y
-XCOPY "%cd%\Novetus\addons\ShadersCompatibility.lua" "%dest%" /y
-XCOPY "%cd%\Novetus\addons\ServerWhitelist.lua" "%dest%" /y
-
-XCOPY "%cd%\Novetus\addons\core\AddonLoader.lua" "%dest%" /y
-
-XCOPY "%cd%\Novetus\addons\novetusexts\webproxy\Asset.cs" "%dest%" /y
-XCOPY "%cd%\Novetus\addons\novetusexts\webproxy\StudioLaunchPage.cs" "%dest%" /y
-XCOPY "%cd%\Novetus\addons\novetusexts\webproxy\UploadWarnings.cs" "%dest%" /y
 if %debug%==1 pause
\ No newline at end of file