Merging from develop

CarbonCommunity · May 4, 2024 · 241c566 · 241c566
1 parent 63269aa
commit 241c566
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 18 deletions.
diff --git a/Carbon.Core/Carbon.Components/Carbon.Bootstrap b/Carbon.Core/Carbon.Components/Carbon.Bootstrap
diff --git a/Carbon.Core/Carbon.Components/Carbon.Common b/Carbon.Core/Carbon.Components/Carbon.Common
diff --git a/Carbon.Core/Carbon.Components/Carbon.SDK b/Carbon.Core/Carbon.Components/Carbon.SDK
diff --git a/Carbon.Core/Carbon.Hooks/Carbon.Hooks.Base b/Carbon.Core/Carbon.Hooks/Carbon.Hooks.Base
diff --git a/Carbon.Core/Carbon.Hooks/Carbon.Hooks.Community b/Carbon.Core/Carbon.Hooks/Carbon.Hooks.Community
diff --git a/Carbon.Core/Carbon/src/Community.cs b/Carbon.Core/Carbon/src/Community.cs
@@ -185,7 +185,7 @@ public override void Initialize()
 			ReloadPlugins();
 		});
 
-		Logger.Log($"  Carbon {Analytics.Version} [{Analytics.Protocol}] {Build.Git.HashShort}");
+		Logger.Log($"  Carbon {Analytics.Version} [{Analytics.Protocol}] {Build.Git.HashShort} on {Analytics.Platform.ToCamelCase()}");
 		Logger.Log($"         {Build.Git.Author} on {Build.Git.Branch} ({Build.Git.Date})");
 		Logger.Log($"  Rust   {Facepunch.BuildInfo.Current.Build.Number}/{Rust.Protocol.printable} on {Facepunch.BuildInfo.Current.Scm.Branch} ({Facepunch.BuildInfo.Current.Scm.Date})");
 

diff --git a/Carbon.Core/Carbon/src/Processors/ScriptProcessor.cs b/Carbon.Core/Carbon/src/Processors/ScriptProcessor.cs
@@ -174,10 +174,7 @@ public override void Process(string file, string input, out string output)
 						Logger.Warn($" Warning! '{Path.GetFileNameWithoutExtension(file)}' uses UnityEngine.GameObject.FindObjectsOfType. That may cause significant performance drops, and/or server stalls. Report to the developer or use at your own discretion!");
 					}
 
-					output = input.Replace("PluginTimers", "Timers")
-						.Replace("using Harmony;", "using HarmonyLib;")
-						.Replace("HarmonyInstance.Create", "new Harmony")
-						.Replace("HarmonyInstance", "Harmony");
+					output = input.Replace("PluginTimers", "Timers");
 				}
 				catch
 				{

diff --git a/Carbon.Core/Carbon/src/Processors/ZipDevScriptProcessor.cs b/Carbon.Core/Carbon/src/Processors/ZipDevScriptProcessor.cs
@@ -244,10 +244,7 @@ public override void Process(string file, string input, out string output)
 						Logger.Warn($" Warning! '{Path.GetFileNameWithoutExtension(file)}' uses UnityEngine.GameObject.FindObjectsOfType. That may cause significant performance drops, and/or server stalls. Report to the developer or use at your own discretion!");
 					}
 
-					output = input.Replace("PluginTimers", "Timers")
-						.Replace("using Harmony;", "using HarmonyLib;")
-						.Replace("HarmonyInstance.Create", "new Harmony")
-						.Replace("HarmonyInstance", "Harmony");
+					output = input.Replace("PluginTimers", "Timers");
 				}
 				catch
 				{

diff --git a/Carbon.Core/Carbon/src/Processors/ZipScriptProcessor.cs b/Carbon.Core/Carbon/src/Processors/ZipScriptProcessor.cs
@@ -195,10 +195,7 @@ public override void Process(string file, string input, out string output)
 						Logger.Warn($" Warning! '{Path.GetFileNameWithoutExtension(file)}' uses UnityEngine.GameObject.FindObjectsOfType. That may cause significant performance drops, and/or server stalls. Report to the developer or use at your own discretion!");
 					}
 
-					output = input.Replace("PluginTimers", "Timers")
-						.Replace("using Harmony;", "using HarmonyLib;")
-						.Replace("HarmonyInstance.Create", "new Harmony")
-						.Replace("HarmonyInstance", "Harmony");
+					output = input.Replace("PluginTimers", "Timers");
 				}
 				catch
 				{