Merge pull request #2 from OxideMod/develop

Update master from develop
OxideMod · Feb 25, 2018 · 3b9821b · 3b9821b
2 parents e99dbaf + 0e40830
commit 3b9821b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/src/Oxide.RustLegacy.csproj b/src/Oxide.RustLegacy.csproj
@@ -22,8 +22,10 @@
     -->
     <FrameworkPathOverride Condition="'$(TargetFramework)' == 'net35' And '$(OS)' == 'Windows_NT'">C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v3.5\Profile\Client</FrameworkPathOverride>
     <FrameworkPathOverride Condition="'$(TargetFramework)' == 'net35' And '$(OS)' == 'OSX'">/Library/Frameworks/Mono.framework/Versions/Current/lib/mono/2.0-api</FrameworkPathOverride>
+    <ThisAssemblyNamespace>Oxide.Game.RustLegacy</ThisAssemblyNamespace>
   </PropertyGroup>
   <ItemGroup>
+    <PackageReference Include="GitInfo" Version="2.0.*" />
     <PackageReference Include="Oxide.References" Version="2.0.*" />
     <PackageReference Include="Oxide.Core" Version="2.0.*" />
     <PackageReference Include="Oxide.CSharp" Version="2.0.*" />

diff --git a/src/RustLegacyExtension.cs b/src/RustLegacyExtension.cs
@@ -41,6 +41,11 @@ public class RustLegacyExtension : Extension
         /// </summary>
         public override VersionNumber Version => AssemblyVersion;
 
+        /// <summary>
+        /// Gets the branch of this extension
+        /// </summary>
+        public override string Branch => "public"; // TODO: Handle this programmatically
+
         /// <summary>
         /// Default game-specific references for use in plugins
         /// </summary>
@@ -169,7 +174,7 @@ internal static void ServerConsole()
                 var gameTime = DateTime.Today.AddHours(EnvironmentControlCenter.Singleton.GetTime()).ToString("hh:mm tt");
                 return $"{gameTime.ToLower()}, {(server.pvp ? "PvP" : "PvE")}";
             };
-            Interface.Oxide.ServerConsole.Status3Right = () => $"Oxide {OxideMod.Version} for {Rust.Defines.Connection.protocol}";
+            Interface.Oxide.ServerConsole.Status3Right = () => $"Oxide.RustLegacy {AssemblyVersion}";
             Interface.Oxide.ServerConsole.Status3RightColor = ConsoleColor.Yellow;
         }