From 1db8c6b40879949b3b2343d070127f582dfe97e9 Mon Sep 17 00:00:00 2001
From: RoyalBlue <11448698+RoyalBlue1@users.noreply.github.com>
Date: Fri, 8 Dec 2023 02:10:29 +0100
Subject: [PATCH] Rename/Move files

---
 Northstar.Custom/mod.json                                | 9 +++------
 .../{sh_event_models.gnut => _event_models.gnut}         | 5 -----
 .../ns_custom_mod_settings.gnut}                         | 0
 3 files changed, 3 insertions(+), 11 deletions(-)
 rename Northstar.Custom/mod/scripts/vscripts/{sh_event_models.gnut => _event_models.gnut} (96%)
 rename Northstar.Custom/mod/scripts/vscripts/{ui_ns_custom_mod_settings.gnut => ui/ns_custom_mod_settings.gnut} (100%)

diff --git a/Northstar.Custom/mod.json b/Northstar.Custom/mod.json
index 841a429ef..399311e43 100644
--- a/Northstar.Custom/mod.json
+++ b/Northstar.Custom/mod.json
@@ -441,17 +441,14 @@
 			"RunOn": "CLIENT || SERVER || UI"
 		},
 		{
-			"Path": "sh_event_models.gnut",
-			"RunOn": "( CLIENT || SERVER ) && LOBBY",
-			"ClientCallback": {
-				"Before": "EventModelsInit"
-			},
+			"Path": "_event_models.gnut",
+			"RunOn": "SERVER && LOBBY",
 			"ServerCallback": {
 				"Before": "EventModelsInit"
 			}
 		},
 		{
-			"Path": "ui_ns_custom_mod_settings.gnut",
+			"Path": "ui/ns_custom_mod_settings.gnut",
 			"RunOn": "UI",
 			"UICallback":{
 				"Before": "NSCustomModSettings"
diff --git a/Northstar.Custom/mod/scripts/vscripts/sh_event_models.gnut b/Northstar.Custom/mod/scripts/vscripts/_event_models.gnut
similarity index 96%
rename from Northstar.Custom/mod/scripts/vscripts/sh_event_models.gnut
rename to Northstar.Custom/mod/scripts/vscripts/_event_models.gnut
index 7f9519fab..de8a637ec 100644
--- a/Northstar.Custom/mod/scripts/vscripts/sh_event_models.gnut
+++ b/Northstar.Custom/mod/scripts/vscripts/_event_models.gnut
@@ -5,8 +5,6 @@ void function EventModelsInit()
 	PrecacheModel( $"models/northstar/desertlands_holiday_tree.mdl" )
 	PrecacheModel( $"models/northstar/floor.mdl" )
 
-#if SERVER
-	
 	if( !GetConVarBool( "ns_show_event_models" ) )
 		return
 	
@@ -14,12 +12,9 @@ void function EventModelsInit()
 	int month = expect int( timeParts[ "month" ] )
 	int day = expect int( timeParts[ "day" ] )
 
-
 	if( ( ( month == 12 ) && ( day >= 18 ) ) || ( ( month == 1 ) && ( day <= 6 ) ) )
 	{
 		CreatePropDynamic( $"models/northstar/desertlands_holiday_tree.mdl", < -60, 740, 30 >, < 0, 0, 0 >, SOLID_VPHYSICS, 1000 )
 		CreatePropDynamic( $"models/northstar/floor.mdl", < -60, 740, 30 >, < 0, 0, 0 >, SOLID_VPHYSICS, 1000 )
 	}
-#endif
-
 }
diff --git a/Northstar.Custom/mod/scripts/vscripts/ui_ns_custom_mod_settings.gnut b/Northstar.Custom/mod/scripts/vscripts/ui/ns_custom_mod_settings.gnut
similarity index 100%
rename from Northstar.Custom/mod/scripts/vscripts/ui_ns_custom_mod_settings.gnut
rename to Northstar.Custom/mod/scripts/vscripts/ui/ns_custom_mod_settings.gnut