Fixed issue with Game.Instance. Prepared API for nuget

gurrenm3 · Apr 11, 2022 · 6bfd56a · 6bfd56a
1 parent 74cd40d
commit 6bfd56a
Show file tree

Hide file tree

Showing 7 changed files with 1,454 additions and 20 deletions.
diff --git a/NoMansSky.Api.Shared/LICENSE b/NoMansSky.Api.Shared/LICENSE
diff --git a/NoMansSky.Api.Shared/NoMansSky.Api.Shared.csproj b/NoMansSky.Api.Shared/NoMansSky.Api.Shared.csproj
@@ -1,14 +1,53 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>net5.0-windows</TargetFramework>
     <RootNamespace>NoMansSky.Api</RootNamespace>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GenerateDocumentationFile>True</GenerateDocumentationFile>
+    <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
+	<Title>NoMansSky.Api.Shared</Title>
+    <PackageId>Gurrenm3.$(AssemblyName)</PackageId>
+    <Authors>Gurrenm3</Authors>
+    <PackageIcon>Icon.png</PackageIcon>
+    <RepositoryUrl>https://github.com/gurrenm3/NoMansSky.Api/tree/master/NoMansSky.Api.Shared</RepositoryUrl>
+    <RepositoryType>git</RepositoryType>
+    <PackageTags>NoMansSky; NoManSky; NMS; Mod; Modding; Tool; Api; Reloaded; Reloaded2</PackageTags>
+    <Description>This project contains all of the backend code for NoMansSky.Api.
+
+Due to the nature of Reloaded2, any code that is published using "IModLoader.AddOrReplaceController()" for use with other mods must be contained within a separate project that has zero third party dependencies. 
+This project contains all of the code that can be published for use in other mods. Or in other words pretty much all of the backend code for the API.
+</Description>
+    <PackageReadmeFile>README.md</PackageReadmeFile>
+    <PackageReleaseNotes>Initial Release</PackageReleaseNotes>
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\Reloaded.ModHelper\Reloaded.ModHelper.Shared\Reloaded.ModHelper.Shared.csproj" />
+    <None Include="..\NoMansSky.Api\Icon.png">
+      <Pack>True</Pack>
+      <PackagePath>\</PackagePath>
+    </None>
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Update="README.md">
+      <Pack>True</Pack>
+      <PackagePath>\</PackagePath>
+    </None>
   </ItemGroup>
 
+	<PropertyGroup>
+		<PackageLicenseFile>LICENSE</PackageLicenseFile>
+		<RepositoryType>git</RepositoryType>
+		<PackageReleaseNotes>Initial Release</PackageReleaseNotes>
+	</PropertyGroup>
+
+	<ItemGroup>
+		<None Include="LICENSE" Pack="true" PackagePath="" />
+	</ItemGroup>
+
+	<ItemGroup>
+	  <PackageReference Include="Gurrenm3.Reloaded.ModHelper.Shared" Version="1.0.0" />
+	</ItemGroup>
+
 </Project>
diff --git a/NoMansSky.Api/LICENSE b/NoMansSky.Api/LICENSE
diff --git a/NoMansSky.Api/ModConfig.json b/NoMansSky.Api/ModConfig.json
@@ -1,9 +1,9 @@
 {
   "ModId": "NoMansSky.Api",
-  "ModName": "No Man's Sky API",
+  "ModName": "No Man\u0027s Sky API",
   "ModAuthor": "Gurrenm3",
   "ModVersion": "1.0.0",
-  "ModDescription": "An API for modding No Man's Sky",
+  "ModDescription": "An API for modding No Man\u0027s Sky",
   "ModDll": "NoMansSky.Api.dll",
   "ModIcon": "Icon.png",
   "ModR2RManagedDll32": "",
@@ -12,9 +12,32 @@
   "ModNativeDll64": "",
   "IsLibrary": false,
   "ReleaseMetadataFileName": "Sewer56.Update.ReleaseMetadata.json",
-  "PluginData": {},
+  "PluginData": {
+    "GitHubDependencies": {
+      "IdToConfigMap": {
+        "reloaded.sharedlib.hooks": {
+          "Config": {
+            "UserName": "Reloaded.SharedLib.Hooks.ReloadedII",
+            "RepositoryName": "Sewer56",
+            "UseReleaseTag": true,
+            "AssetFileName": "reloaded.sharedlib.hooks.zip"
+          }
+        }
+      }
+    },
+    "GitHubRelease": {
+      "UserName": "",
+      "RepositoryName": "",
+      "UseReleaseTag": true,
+      "AssetFileName": "Mod.zip"
+    }
+  },
   "IsUniversalMod": false,
-  "ModDependencies": ["reloaded.sharedlib.hooks"],
+  "ModDependencies": [
+    "reloaded.sharedlib.hooks"
+  ],
   "OptionalDependencies": [],
-  "SupportedAppId": []
-}
+  "SupportedAppId": [
+    "nms.exe.unpacked.exe"
+  ]
+}
diff --git a/NoMansSky.Api/NMSMod.cs b/NoMansSky.Api/NMSMod.cs
@@ -12,7 +12,7 @@ public class NMSMod : ReloadedMod
         /// <summary>
         /// Represents the instance of the Game class.
         /// </summary>
-        public IGame Game => Api.Game.Instance;
+        public IGame Game => IGame.Instance;
 
         /// <summary>
         /// Represents the instance of the Game Loop.

diff --git a/NoMansSky.Api/NoMansSky.Api.csproj b/NoMansSky.Api/NoMansSky.Api.csproj
@@ -9,6 +9,11 @@
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
     <OutputPath>$(RELOADEDIIMODS)\NoMansSky.Api</OutputPath>
     <GenerateDocumentationFile>True</GenerateDocumentationFile>
+    <PackageTags>NoMansSky; NoManSky; NMS; Mod; Modding; Tool; Api; Reloaded; Reloaded2</PackageTags>
+    <PackageIcon>Icon.png</PackageIcon>
+    <RepositoryUrl>https://github.com/gurrenm3/NoMansSky.Api</RepositoryUrl>
+    <RepositoryType>Git</RepositoryType>
+    <PackageReadmeFile>README.md</PackageReadmeFile>
   </PropertyGroup>
 
   <ItemGroup>
@@ -24,26 +29,40 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Reloaded.Memory.Sigscan" Version="2.0.0" />
-    <PackageReference Include="Reloaded.Mod.Interfaces" Version="2.1.0" />
-    <PackageReference Include="Reloaded.SharedLib.Hooks" Version="1.9.0" />
+    <None Include="..\README.md">
+      <Pack>True</Pack>
+      <PackagePath>\</PackagePath>
+    </None>
   </ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\..\Reloaded.ModHelper\Reloaded.ModHelper.Shared\Reloaded.ModHelper.Shared.csproj" />
-    <ProjectReference Include="..\..\Reloaded.ModHelper\Reloaded.ModHelper\Reloaded.ModHelper.csproj" />
-    <ProjectReference Include="..\NoMansSky.Api.Shared\NoMansSky.Api.Shared.csproj" />
-  </ItemGroup>
+	<PropertyGroup>
+		<PackageLicenseFile>LICENSE</PackageLicenseFile>
+		<RepositoryType>git</RepositoryType>
+		<PackageReleaseNotes>Initial Release</PackageReleaseNotes>
+		<Title>$(AssemblyName)</Title>
+		<PackageId>Gurrenm3.$(AssemblyName)</PackageId>
+		<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
+		<Description>A C# modding API for No Man's Sky. Built with Reloaded2, a set of extremely powerful modding tools.
+The purpose of this library is to help mod makers create incredibly diverse and unique mods that would normally be quite impossible. </Description>
+	</PropertyGroup>
+
+	<ItemGroup>
+		<None Include="LICENSE" Pack="true" PackagePath="" />
+	</ItemGroup>
 
   <ItemGroup>
-    <Reference Include="libMBIN">
-      <HintPath>..\Dependencies\libMBIN.dll</HintPath>
-    </Reference>
+    <PackageReference Include="Gurrenm3.NoMansSky.Api.Shared" Version="1.0.0" />
+    <PackageReference Include="Gurrenm3.Reloaded.ModHelper" Version="1.0.0" />
+    <PackageReference Include="Reloaded.Memory.Sigscan" Version="2.0.0" />
+    <PackageReference Include="Reloaded.Mod.Interfaces" Version="2.1.0" />
+    <PackageReference Include="Reloaded.SharedLib.Hooks" Version="1.9.0" />
   </ItemGroup>
 
   <ItemGroup>
     <None Update="Icon.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <Pack>True</Pack>
+      <PackagePath>\</PackagePath>
     </None>
   </ItemGroup>
 

diff --git a/NoMansSky.Api/Program.cs b/NoMansSky.Api/Program.cs
@@ -53,6 +53,7 @@ public class Program : IMod, IExports
         private IModLogger Logger = null!;
 
         private IGame gameInstance = null!;
+        private IGameLoop gameLoop = null!;
 
         /// <summary>
         /// Entry point for your mod.
@@ -84,7 +85,11 @@ Your mod code starts below.
 
             Logger = new ModLogger(_modConfig, _logger);
             gameInstance = new Game(Logger);
+            gameLoop = gameInstance.GameLoop;
+            Logger.WriteLine($"gameLoop == null {gameLoop == null}");
+
             _modLoader.AddOrReplaceController(this, gameInstance);
+            _modLoader.AddOrReplaceController(this, gameLoop);
 
             _mod = new Mod(_modConfig, _hooks, Logger);