Update how interfaces are initialized so we can initialize userless

Facepunch.Steamworks/Generated/Interfaces/ISteamApps.cs

@@ -9,10 +9,6 @@ namespace Steamworks
 {
 	internal class ISteamApps : SteamInterface
 	{
-		public ISteamApps( bool server = false ) : base( server )
-		{
-		}
-		
 		public override string InterfaceName => "STEAMAPPS_INTERFACE_VERSION008";
 		
 		public override void InitInternals()

Facepunch.Steamworks/Generated/Interfaces/ISteamFriends.cs

@@ -9,10 +9,6 @@ namespace Steamworks
 {
 	internal class ISteamFriends : SteamInterface
 	{
-		public ISteamFriends( bool server = false ) : base( server )
-		{
-		}
-		
 		public override string InterfaceName => "SteamFriends017";
 		
 		public override void InitInternals()

Facepunch.Steamworks/Generated/Interfaces/ISteamGameServer.cs

@@ -9,10 +9,6 @@ namespace Steamworks
 {
 	internal class ISteamGameServer : SteamInterface
 	{
-		public ISteamGameServer( bool server = false ) : base( server )
-		{
-		}
-		
 		public override string InterfaceName => "SteamGameServer012";
 		
 		public override void InitInternals()

Facepunch.Steamworks/Generated/Interfaces/ISteamInventory.cs

@@ -9,10 +9,6 @@ namespace Steamworks
 {
 	internal class ISteamInventory : SteamInterface
 	{
-		public ISteamInventory( bool server = false ) : base( server )
-		{
-		}
-		
 		public override string InterfaceName => "STEAMINVENTORY_INTERFACE_V003";
 		
 		public override void InitInternals()

Facepunch.Steamworks/Generated/Interfaces/ISteamMatchmaking.cs

@@ -9,10 +9,6 @@ namespace Steamworks
 {
 	internal class ISteamMatchmaking : SteamInterface
 	{
-		public ISteamMatchmaking( bool server = false ) : base( server )
-		{
-		}
-		
 		public override string InterfaceName => "SteamMatchMaking009";
 		
 		public override void InitInternals()

Facepunch.Steamworks/Generated/Interfaces/ISteamMatchmakingServers.cs

@@ -9,10 +9,6 @@ namespace Steamworks
 {
 	internal class ISteamMatchmakingServers : SteamInterface
 	{
-		public ISteamMatchmakingServers( bool server = false ) : base( server )
-		{
-		}
-		
 		public override string InterfaceName => "SteamMatchMakingServers002";
 		
 		public override void InitInternals()

Facepunch.Steamworks/Generated/Interfaces/ISteamMusic.cs

@@ -9,10 +9,6 @@ namespace Steamworks
 {
 	internal class ISteamMusic : SteamInterface
 	{
-		public ISteamMusic( bool server = false ) : base( server )
-		{
-		}
-		
 		public override string InterfaceName => "STEAMMUSIC_INTERFACE_VERSION001";
 		
 		public override void InitInternals()

Facepunch.Steamworks/Generated/Interfaces/ISteamNetworking.cs

@@ -9,10 +9,6 @@ namespace Steamworks
 {
 	internal class ISteamNetworking : SteamInterface
 	{
-		public ISteamNetworking( bool server = false ) : base( server )
-		{
-		}
-		
 		public override string InterfaceName => "SteamNetworking005";
 		
 		public override void InitInternals()

Facepunch.Steamworks/Generated/Interfaces/ISteamNetworkingUtils.cs

@@ -9,10 +9,6 @@ namespace Steamworks
 {
 	internal class ISteamNetworkingUtils : SteamInterface
 	{
-		public ISteamNetworkingUtils( bool server = false ) : base( server )
-		{
-		}
-		
 		public override string InterfaceName => "SteamNetworkingUtils001";
 		
 		public override void InitInternals()

Facepunch.Steamworks/Generated/Interfaces/ISteamParentalSettings.cs

@@ -9,10 +9,6 @@ namespace Steamworks
 {
 	internal class ISteamParentalSettings : SteamInterface
 	{
-		public ISteamParentalSettings( bool server = false ) : base( server )
-		{
-		}
-		
 		public override string InterfaceName => "STEAMPARENTALSETTINGS_INTERFACE_VERSION001";
 		
 		public override void InitInternals()

Facepunch.Steamworks/Generated/Interfaces/ISteamParties.cs

@@ -9,10 +9,6 @@ namespace Steamworks
 {
 	internal class ISteamParties : SteamInterface
 	{
-		public ISteamParties( bool server = false ) : base( server )
-		{
-		}
-		
 		public override string InterfaceName => "SteamParties002";
 		
 		public override void InitInternals()

Facepunch.Steamworks/Generated/Interfaces/ISteamRemoteStorage.cs

@@ -9,10 +9,6 @@ namespace Steamworks
 {
 	internal class ISteamRemoteStorage : SteamInterface
 	{
-		public ISteamRemoteStorage( bool server = false ) : base( server )
-		{
-		}
-		
 		public override string InterfaceName => "STEAMREMOTESTORAGE_INTERFACE_VERSION014";
 		
 		public override void InitInternals()

Facepunch.Steamworks/Generated/Interfaces/ISteamScreenshots.cs

@@ -9,10 +9,6 @@ namespace Steamworks
 {
 	internal class ISteamScreenshots : SteamInterface
 	{
-		public ISteamScreenshots( bool server = false ) : base( server )
-		{
-		}
-		
 		public override string InterfaceName => "STEAMSCREENSHOTS_INTERFACE_VERSION003";
 		
 		public override void InitInternals()

Facepunch.Steamworks/Generated/Interfaces/ISteamUGC.cs

@@ -9,10 +9,6 @@ namespace Steamworks
 {
 	internal class ISteamUGC : SteamInterface
 	{
-		public ISteamUGC( bool server = false ) : base( server )
-		{
-		}
-		
 		public override string InterfaceName => "STEAMUGC_INTERFACE_VERSION012";
 		
 		public override void InitInternals()

Facepunch.Steamworks/Generated/Interfaces/ISteamUser.cs

@@ -9,10 +9,6 @@ namespace Steamworks
 {
 	internal class ISteamUser : SteamInterface
 	{
-		public ISteamUser( bool server = false ) : base( server )
-		{
-		}
-		
 		public override string InterfaceName => "SteamUser020";
 		
 		public override void InitInternals()

Facepunch.Steamworks/Generated/Interfaces/ISteamUserStats.cs

@@ -9,10 +9,6 @@ namespace Steamworks
 {
 	internal class ISteamUserStats : SteamInterface
 	{
-		public ISteamUserStats( bool server = false ) : base( server )
-		{
-		}
-		
 		public override string InterfaceName => "STEAMUSERSTATS_INTERFACE_VERSION011";
 		
 		public override void InitInternals()

Facepunch.Steamworks/Generated/Interfaces/ISteamUtils.cs

@@ -9,10 +9,6 @@ namespace Steamworks
 {
 	internal class ISteamUtils : SteamInterface
 	{
-		public ISteamUtils( bool server = false ) : base( server )
-		{
-		}
-		
 		public override string InterfaceName => "SteamUtils009";
 		
 		public override void InitInternals()

Facepunch.Steamworks/Generated/Interfaces/ISteamVideo.cs

@@ -9,10 +9,6 @@ namespace Steamworks
 {
 	internal class ISteamVideo : SteamInterface
 	{
-		public ISteamVideo( bool server = false ) : base( server )
-		{
-		}
-		
 		public override string InterfaceName => "STEAMVIDEO_INTERFACE_V002";
 		
 		public override void InitInternals()

Facepunch.Steamworks/ServerList/Base.cs

@@ -18,7 +18,10 @@ namespace Steamworks.ServerList
 			get
 			{
 				if ( _internal == null )
+				{
 					_internal = new ISteamMatchmakingServers();
+					_internal.InitClient();
+				}
 
 				return _internal;
 			}

Facepunch.Steamworks/SteamApps.cs

@@ -19,7 +19,10 @@ namespace Steamworks
 			get
 			{
 				if ( _internal == null )
+				{
 					_internal = new ISteamApps();
+					_internal.InitClient();
+				}
 
 				return _internal;
 			}

Facepunch.Steamworks/SteamFriends.cs

@@ -20,6 +20,7 @@ namespace Steamworks
 				if ( _internal == null )
 				{
 					_internal = new ISteamFriends();
+					_internal.InitClient();
 
 					richPresence = new Dictionary<string, string>();
 				}

Facepunch.Steamworks/SteamInventory.cs

@@ -20,7 +20,10 @@ namespace Steamworks
 			get
 			{
 				if ( _internal == null )
+				{ 
 					_internal = new ISteamInventory();
+					_internal.InitClient();
+				}
 
 				return _internal;
 			}

Facepunch.Steamworks/SteamMatchmaking.cs

@@ -18,7 +18,10 @@ namespace Steamworks
 			get
 			{
 				if ( _internal == null )
+				{
 					_internal = new ISteamMatchmaking();
+					_internal.InitClient();
+				}
 
 				return _internal;
 			}

Facepunch.Steamworks/SteamMusic.cs

@@ -21,7 +21,10 @@ namespace Steamworks
 			get
 			{
 				if ( _internal == null )
+				{
 					_internal = new ISteamMusic();
+					_internal.InitClient();
+				}
 
 				return _internal;
 			}

Facepunch.Steamworks/SteamNetworking.cs

@@ -16,7 +16,10 @@ namespace Steamworks
 			get
 			{
 				if ( _internal == null )
+				{
 					_internal = new ISteamNetworking();
+					_internal.InitClient();
+				}
 
 				return _internal;
 			}

Facepunch.Steamworks/SteamParental.cs

@@ -18,7 +18,10 @@ namespace Steamworks
 			get
 			{
 				if ( _internal == null )
+				{
 					_internal = new ISteamParentalSettings();
+					_internal.InitClient();
+				}
 
 				return _internal;
 			}

Facepunch.Steamworks/SteamParties.cs

@@ -15,7 +15,10 @@ namespace Steamworks
 			get
 			{
 				if ( _internal == null )
+				{
 					_internal = new ISteamParties();
+					_internal.InitClient();
+				}
 
 				return _internal;
 			}

Facepunch.Steamworks/SteamRemoteStorage.cs

@@ -18,7 +18,10 @@ namespace Steamworks
 			get
 			{
 				if ( _internal == null )
+				{
 					_internal = new ISteamRemoteStorage();
+					_internal.InitClient();
+				}
 
 				return _internal;
 			}

Facepunch.Steamworks/SteamScreenshots.cs

@@ -18,7 +18,10 @@ namespace Steamworks
 			get
 			{
 				if ( _internal == null )
+				{
 					_internal = new ISteamScreenshots();
+					_internal.InitClient();
+				}
 
 				return _internal;
 			}

Facepunch.Steamworks/SteamServer.cs

@@ -20,7 +20,10 @@ namespace Steamworks
 			get
 			{
 				if ( _internal == null )
-					_internal = new ISteamGameServer( true );
+				{
+					_internal = new ISteamGameServer( );
+					_internal.InitServer();
+				}
 
 				return _internal;
 			}

Facepunch.Steamworks/SteamServerInventory.cs

@@ -17,7 +17,10 @@ namespace Steamworks
 			get
 			{
 				if ( _internal == null )
+				{
 					_internal = new ISteamInventory();
+					_internal.InitClient();
+				}
 
 				return _internal;
 			}

Facepunch.Steamworks/SteamUgc.cs

@@ -22,6 +22,7 @@ namespace Steamworks
 				if ( _internal == null )
 				{
 					_internal = new ISteamUGC();
+					_internal.InitClient();
 				}
 
 				return _internal;

Facepunch.Steamworks/SteamUser.cs

@@ -22,6 +22,7 @@ namespace Steamworks
 				if ( _internal == null )
 				{
 					_internal = new ISteamUser();
+					_internal.InitClient();
 
 					richPresence = new Dictionary<string, string>();
 

Facepunch.Steamworks/SteamUserStats.cs

@@ -17,6 +17,8 @@ namespace Steamworks
 				if ( _internal == null )
 				{
 					_internal = new ISteamUserStats();
+					_internal.InitClient();
+
 					RequestCurrentStats();
 				}
 

Facepunch.Steamworks/SteamUtils.cs

@@ -18,7 +18,10 @@ namespace Steamworks
 			get
 			{
 				if ( _internal == null )
+				{
 					_internal = new ISteamUtils();
+					_internal.InitClient();
+				}
 
 				return _internal;
 			}

Facepunch.Steamworks/SteamVideo.cs

@@ -18,7 +18,10 @@ namespace Steamworks
 			get
 			{
 				if ( _internal == null )
+				{
 					_internal = new ISteamVideo();
+					_internal.InitClient();
+				}
 
 				return _internal;
 			}

Facepunch.Steamworks/Utility/SteamInterface.cs

@@ -16,28 +16,42 @@ namespace Steamworks
 
 		public virtual string InterfaceName => null;
 
-		public SteamInterface( bool server = false )
+		public virtual void InitClient()
 		{
-			//
+			var user = SteamAPI.GetHSteamUser();
-			// If teh client isn't initialized but the server is, 
+			Self = SteamInternal.FindOrCreateUserInterface( user, InterfaceName );
-			// try to open this interface in server mode
-			//
-			if ( !SteamClient.IsValid && SteamServer.IsValid ) server = true;
-
-			var hUser = server ?
-						SteamGameServer.GetHSteamUser() : 
-						SteamAPI.GetHSteamUser();
-
-			if ( hUser == 0 )
-				throw new System.Exception( "Steamworks is uninitialized" );
-
-			Self = server ?
-					SteamInternal.FindOrCreateGameServerInterface( hUser, InterfaceName ) :
-					SteamInternal.FindOrCreateUserInterface( hUser, InterfaceName );
 
 			if ( Self == IntPtr.Zero )
-				throw new System.Exception( $"Couldn't find interface {InterfaceName} (server:{server})" );
+				throw new System.Exception( $"Couldn't find interface {InterfaceName}" );
 
+			VTable = Marshal.ReadIntPtr( Self, 0 );
+			if ( Self == IntPtr.Zero )
+				throw new System.Exception( $"Invalid VTable for {InterfaceName}" );
+
+			InitInternals();
+		}
+
+		public virtual void InitServer()
+		{
+			var user = SteamGameServer.GetHSteamUser();
+			Self = SteamInternal.FindOrCreateGameServerInterface( user, InterfaceName );
+
+			if ( Self == IntPtr.Zero )
+				throw new System.Exception( $"Couldn't find server interface {InterfaceName}" );
+
+			VTable = Marshal.ReadIntPtr( Self, 0 );
+			if ( Self == IntPtr.Zero )
+				throw new System.Exception( $"Invalid VTable for server {InterfaceName}" );
+
+			InitInternals();
+		}
+
+		public virtual void InitUserless()
+		{
+			Self = SteamInternal.FindOrCreateUserInterface( 0, InterfaceName );
+
+			if ( Self == IntPtr.Zero )
+				throw new System.Exception( $"Couldn't find interface {InterfaceName}" );
 
 			VTable = Marshal.ReadIntPtr( Self, 0 );
 			if ( Self == IntPtr.Zero )

Generator/CodeWriter/ClassVTable.cs

@@ -27,13 +27,6 @@ namespace Generator
 			{
 				StartBlock( $"internal class {clss.Name} : SteamInterface" );
 				{
-					StartBlock( $"public {clss.Name}( bool server = false ) : base( server )" );
-					{
-
-					}
-					EndBlock();
-					WriteLine();
-
 					WriteLine( $"public override string InterfaceName => \"{clss.InterfaceString}\";" );
 					WriteLine();