Merge branch 'workshop'

gamemodes/jazztronauts/gamemode/map/mapcontrol.lua

@@ -1,7 +1,7 @@
 
 module( 'mapcontrol', package.seeall )
 local defaultMapHost = "http://jazz.foohy.net/addons.txt"
-local defaultAddonCache = "jazztronauts/addons.txt"
+local defaultAddonList = "data_static/jazztronauts/addons.txt"
 local overrideAddonCache = "jazztronauts/addons_override.txt"
 
 local fallbackVersion = VERSION < 210618 -- Maps unmounted fixed in gmod dev branch version 210618. Before that, fallback to local addons/maps instead
@@ -312,7 +312,7 @@ if SERVER then
 				addonsStr = file.Read(overrideAddonCache, "DATA")
 
 				-- Built in cache that comes with the game
-				addonsStr = addonsStr or file.Read(defaultAddonCache, "DATA")
+				addonsStr = addonsStr or file.Read(defaultAddonList, "GAME")
 			end
 
 			insertAddons(GetExternalMapAddons(addonsStr or ""))

gamemodes/jazztronauts/gamemode/ui/dialog/shared.lua

@@ -29,7 +29,7 @@ CMD_EXIT = "exit"
 ScriptSources = ScriptSources or {} -- Raw uncompiled script sources, transmitted to clients
 g_graph = g_graph or {} 			-- Compiled script graphs
 
-local ScriptPath = "data/scripts"--_"..string.lower(GetConVar("gmod_language"):GetString()).."/"
+local ScriptPath = "data_static/jazztronauts/scripts"
 local HIGH_PRIORITY_SCRIPTS = { 
 	["macros.txt"] = true,
 	["jazz_bar_intro.txt"] = true,

other/bspzip/list.py

@@ -0,0 +1,24 @@
+import sys
+import pathlib
+
+if __name__ == "__main__":
+    if (len(sys.argv) < 1):
+        print("Not enough arguments")
+        exit(1)
+
+    output_file = sys.argv[1]
+    zip_folder = sys.argv[2]
+
+    f = open(output_file, "w")
+
+    ZipDirectory = pathlib.Path(zip_folder)
+    paths = ZipDirectory.rglob("*")
+
+    for path in list(paths):
+        if path.is_file():
+            f.write(str(path.relative_to(zip_folder)).replace("\\", "/"))
+            f.write("\n")
+            f.write(str(path.resolve()))
+
+    print("all done")
+    f.close()

other/bspzip/package_bsps.bat

@@ -0,0 +1,30 @@
+@echo off
+SETLOCAL ENABLEDELAYEDEXPANSION
+
+rem Assumes we're running as a loosely installed addon in the garrysmod/addons/jazztronauts directory!
+set "BSPZIP=..\..\..\..\..\bin\bspzip.exe"
+set "BSPFOLDER=..\..\maps"
+set "ZIPFOLDER=..\..\bspzip"
+
+
+call:pakBspList jazz_bar
+call:pakBspList jazz_apartments
+
+goto:eof
+
+
+
+rem Package all the files in bspzip/<mapname> into <mapname>.bsp
+:pakBspList
+
+echo "Build tmp file list"
+python list.py %~1.txt "%ZIPFOLDER%\%~1"
+
+echo "Packing %~1.bsp"
+"%BSPZIP%" -addorupdatelist "%BSPFOLDER%/%~1.bsp" %~1.txt "%BSPFOLDER%/%~1.bsp"
+del %~1.txt
+
+goto:eof
+
+PAUSE
+ENDLOCAL

other/uploader/split.txt

@@ -1,6 +1,13 @@
 # Initially add everything to the first addon
 addon_jazz.json:1452613192
-** #include everything
+data_static/**
+gamemodes/**
+lua/**
+maps/**
+materials/**
+models/**
+resource/**
+sound/**
 
 # GMod now supports larger resource packs, so just have everything in the first one
 # Addons can't be completely blank, so just include a single script that prints that it should be unsubscribed