Version 2.4.1

Author: itscynxx

README.md

@@ -20,7 +20,7 @@ Patch for Northstar.Client to enable client-side mods on official servers.
 Titanfall2
   R2Titanfall
     packages
-      NanohmProtogen-VanillaPlus-2.4.0
+      NanohmProtogen-VanillaPlus-2.4.1
 ```
 
 Note that the folder in `packages` is NOT a `.zip` file

changelog.md

@@ -1,3 +1,6 @@
+2.4.1
+- Add warning to migrate to `-vanilla` if the user is still on `-norestrictservercommands`
+
 2.4
 - Update VanillaPlus to use `-vanilla` as `-norestrictservercommands` is deprecated
 - Remove DT fov mod warning

manifest.json

@@ -1,6 +1,6 @@
 {
     "name": "VanillaPlus",
-    "version_number": "2.4.0",
+    "version_number": "2.4.1",
     "website_url": "https://github.com/Zayveeo5e/NP.VanillaPlus",
     "description": "THIS MOD HAS SPECIAL INSTALL INSTRUCTIONS IN THE DESCRIPTION, PLEASE READ THEM. Modified Northstar.Client to load Client-Side mods on Vanilla servers",
     "dependencies": []

mods/NP.VanillaPlus/mod.json

@@ -2,9 +2,10 @@
   "Name" : "VanillaPlus",
   "Description": "A stripped down and modified Northstar.Client mod that allows for client-side mod loading on official Respawn servers\n\nMade by Nanohm, remastered by Cyn",
   "LoadPriority": -1,
-  "Version": "2.4",
+  "Version": "2.4.1",
 
   "Dependencies": {
+    "HAS_CLIENT": "Northstar.Client",
     "HAS_MORESKINS": "MoreSkins-",
     "HAS_FRAMEWORK": "Peepee.TitanFramework"
 	},
@@ -24,6 +25,10 @@
       "DefaultValue": "0",
       "Flags": 16777216
     },
+    {
+      "Name": "norestrictservercommands_remind",
+      "DefaultValue": "1"
+    },
     {
       "Name": "core_remind",
       "DefaultValue": "1"

mods/NP.VanillaPlus/mod/scripts/vscripts/ui/check_mods.nut

@@ -14,14 +14,26 @@ void function CheckForMods()
 {
     WaitFrame()
 
-    if (!VANILLA) {
-        // Prints an error if the user isn't in vanilla compatibilty mode
-        // Mostly to be used with Spectre log reading later (hence the 0)
-        printt("VanillaPlus Error 0: Not in vanilla compatibility mode")
-        if (GetConVarInt("core_remind") == 1) CoreMods()
+    if (!VANILLA) 
+    {
+        if (!HAS_CLIENT)
+        {
+            // if the user isn't in vanilla compat, has vanillaplus, and doesn't have client, they're basically 99% guaranteed to be using -norestrictservercommands still
+            // this checks we don't have client because having only client on 2.0+ causes a compile error
+            printt("VanillaPlus Error 1: Using -norestrictservercommands instead of -vanilla")
+            if (GetConVarInt("norestrictservercommands_remind") == 1) UpdateToUsingVanillaLaunchOption()
+        }    
+        else
+        {
+            // Prints an error if the user isn't in vanilla compatibilty mode
+            // Mostly to be used with Spectre log reading later (hence the 0)
+            printt("VanillaPlus Error 0: Not in vanilla compatibility mode")
+            if (GetConVarInt("core_remind") == 1) CoreMods()
+        }
     }
 
-    else if (HAS_MORESKINS || HAS_FRAMEWORK) {
+    else if (HAS_MORESKINS || HAS_FRAMEWORK) 
+    {
         OtherMods()
     }
 }
@@ -64,4 +76,20 @@ void function CoreMods()
     })
 	AddDialogButton(coreModWarnDiag, "Continue to Northstar servers", void function(){ClientCommand("uiscript_reset"); ClientCommand("core_remind 0")})
     OpenDialog(coreModWarnDiag)
+}
+
+void function UpdateToUsingVanillaLaunchOption()
+{
+    DialogData coreModWarnDiag
+    coreModWarnDiag.header = "Not using vanilla compatibiltiy mode!"
+
+    coreModWarnDiag.message = "You aren't using Northstar's vanilla compatibility mode!\n\nIt seems that you're still using the launch option '-norestrictservercommands'.\n\nRecently, a better version of vanilla using the launch option '-vanilla' has come out.\n\nPlease update to that.\n\nYou can read the instructions for how to properly do it again, or you can continue to using VanillaPlus as is, altough it isn't recommended."
+
+    coreModWarnDiag.image = $"ui/menu/common/dialog_error"
+    AddDialogButton(coreModWarnDiag, "Go to instructions", void function(){
+        LaunchExternalWebBrowser("https://northstar.thunderstore.io/package/NanohmProtogen/VanillaPlus/", WEBBROWSER_FLAG_FORCEEXTERNAL); ClientCommand("uiscript_reset"); ClientCommand("core_remind 0")
+
+    })
+	AddDialogButton(coreModWarnDiag, "Continue to not recommended VanillaPlus", void function(){ClientCommand("uiscript_reset"); ClientCommand("norestrictservercommands_remind 0")})
+    OpenDialog(coreModWarnDiag)
 }

mods/NP.VanillaPlus/mod/scripts/vscripts/ui/menu_ingame.nut

@@ -112,9 +112,11 @@ void function InitInGameMPMenu()
 		Hud_AddEventHandler( soundButton, UIE_CLICK, AdvanceMenuEventHandler( GetMenu( "VideoMenu" ) ) )
 	#endif
 
+	#if VANILLA
 	// MOD SETTINGS
 	var modSettingsButton = AddComboButton( comboStruct, headerIndex, buttonIndex++, "Mod Settings" )
 	Hud_AddEventHandler( modSettingsButton, UIE_CLICK, AdvanceMenuEventHandler( GetMenu( "ModSettings" ) ) )
+	#endif
 
 	// Nobody reads the FAQ so we replace it with ModSettings because of the limited combobutton space available
 	//file.faqButton = AddComboButton( comboStruct, headerIndex, buttonIndex++, "#KNB_MENU_HEADER" )
@@ -261,9 +263,11 @@ void function InitInGameSPMenu()
 		Hud_AddEventHandler( videoButton, UIE_CLICK, AdvanceMenuEventHandler( GetMenu( "VideoMenu" ) ) )
 	#endif
 
+	#if VANILLA
 	// MOD SETTINGS
 	var modSettingsButton = AddComboButton( comboStruct, headerIndex, buttonIndex++, "Mod Settings" )
 	Hud_AddEventHandler( modSettingsButton, UIE_CLICK, AdvanceMenuEventHandler( GetMenu( "ModSettings" ) ) )
+	#endif
 
 	array<var> orderedButtons
 

mods/NP.VanillaPlus/mod/scripts/vscripts/ui/menu_lobby.nut

@@ -322,9 +322,12 @@ void function SetupComboButtonTest( var menu )
 		var soundButton = AddComboButton( comboStruct, headerIndex, buttonIndex++, "#VIDEO" )
 		Hud_AddEventHandler( soundButton, UIE_CLICK, AdvanceMenuEventHandler( GetMenu( "VideoMenu" ) ) )
 	#endif
+
+	#if VANILLA
 	// MOD SETTINGS
 	var modSettingsButton = AddComboButton( comboStruct, headerIndex, buttonIndex++, "#MOD_SETTINGS" )
 	Hud_AddEventHandler( modSettingsButton, UIE_CLICK, AdvanceMenuEventHandler( GetMenu( "ModSettings" ) ) )
+	#endif
 
 	comboStruct.navUpButtonDisabled = true
 	comboStruct.navDownButton = file.genUpButton

mods/NP.VanillaPlus/mod/scripts/vscripts/ui/panel_mainmenu.nut

@@ -102,9 +102,11 @@ void function InitMainMenuPanel()
 		Hud_AddEventHandler( videoButton, UIE_CLICK, AdvanceMenuEventHandler( GetMenu( "VideoMenu" ) ) )
 	#endif
 
+	#if VANILLA
 	// MOD SETTINGS
 	var modSettingsButton = AddComboButton( comboStruct, headerIndex, buttonIndex++, "#MOD_SETTINGS" )
 	Hud_AddEventHandler( modSettingsButton, UIE_CLICK, AdvanceMenuEventHandler( GetMenu( "ModSettings" ) ) )
+	#endif
 
 	var spotlightLargeButton = Hud_GetChild( file.spotlightPanel, "SpotlightLarge" )
 	spotlightLargeButton.SetNavLeft( file.spButtons[0] )