From 92b5cd8228e131444579e429750c6b873d4b4610 Mon Sep 17 00:00:00 2001 From: Austin Vandersluis Date: Mon, 11 Sep 2023 13:30:08 -0700 Subject: [PATCH] Update GitBranch implementation --- src/RustCommands.cs | 2 +- src/RustCore.cs | 6 ++++-- src/RustExtension.cs | 2 -- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/RustCommands.cs b/src/RustCommands.cs index 96bfb3772..a9814f87d 100644 --- a/src/RustCommands.cs +++ b/src/RustCommands.cs @@ -707,7 +707,7 @@ private void VersionCommand(IPlayer player) if (player.IsServer) { string format = "Oxide.Rust Version: {0}\nOxide.Rust Branch: {1}"; - player.Reply(string.Format(format, RustExtension.AssemblyVersion, RustExtension.AssemblyBranch)); + player.Reply(string.Format(format, RustExtension.AssemblyVersion, Extension.Branch)); } else { diff --git a/src/RustCore.cs b/src/RustCore.cs index 4ee7fb8ac..cb3bceea3 100644 --- a/src/RustCore.cs +++ b/src/RustCore.cs @@ -26,9 +26,10 @@ public partial class RustCore : CSPlugin public RustCore() { // Set plugin info attributes + Extension = Interface.Oxide.GetExtension(); Title = "Rust"; - Author = RustExtension.AssemblyAuthors; - Version = RustExtension.AssemblyVersion; + Author = Extension.Author; + Version = Extension.Version; } // Libraries @@ -41,6 +42,7 @@ public RustCore() internal static readonly RustCovalenceProvider Covalence = RustCovalenceProvider.Instance; internal readonly PluginManager pluginManager = Interface.Oxide.RootPluginManager; internal readonly IServer Server = Covalence.CreateServer(); + internal readonly RustExtension Extension; // Commands that a plugin can't override internal static IEnumerable RestrictedCommands => new[] diff --git a/src/RustExtension.cs b/src/RustExtension.cs index d001a43d8..173a41e89 100644 --- a/src/RustExtension.cs +++ b/src/RustExtension.cs @@ -19,7 +19,6 @@ public class RustExtension : Extension internal static AssemblyName AssemblyName = Assembly.GetName(); internal static VersionNumber AssemblyVersion = new VersionNumber(AssemblyName.Version.Major, AssemblyName.Version.Minor, AssemblyName.Version.Build); internal static string AssemblyAuthors = ((AssemblyCompanyAttribute)Attribute.GetCustomAttribute(Assembly, typeof(AssemblyCompanyAttribute), false)).Company; - internal static string AssemblyBranch; private static readonly WebClient WebClient = new WebClient(); private static VersionNumber LatestExtVersion = AssemblyVersion; @@ -106,7 +105,6 @@ public class RustExtension : Extension /// public RustExtension(ExtensionManager manager) : base(manager) { - AssemblyBranch = Branch ?? "master"; } ///