From 241c56698c1f05ad8329370f4a35517ba89541d3 Mon Sep 17 00:00:00 2001 From: raul Date: Sat, 4 May 2024 02:25:32 +0200 Subject: [PATCH] Merging from develop --- Carbon.Core/Carbon.Components/Carbon.Bootstrap | 2 +- Carbon.Core/Carbon.Components/Carbon.Common | 2 +- Carbon.Core/Carbon.Components/Carbon.SDK | 2 +- Carbon.Core/Carbon.Hooks/Carbon.Hooks.Base | 2 +- Carbon.Core/Carbon.Hooks/Carbon.Hooks.Community | 2 +- Carbon.Core/Carbon/src/Community.cs | 2 +- Carbon.Core/Carbon/src/Processors/ScriptProcessor.cs | 5 +---- Carbon.Core/Carbon/src/Processors/ZipDevScriptProcessor.cs | 5 +---- Carbon.Core/Carbon/src/Processors/ZipScriptProcessor.cs | 5 +---- 9 files changed, 9 insertions(+), 18 deletions(-) diff --git a/Carbon.Core/Carbon.Components/Carbon.Bootstrap b/Carbon.Core/Carbon.Components/Carbon.Bootstrap index d8fac55aa..924099b91 160000 --- a/Carbon.Core/Carbon.Components/Carbon.Bootstrap +++ b/Carbon.Core/Carbon.Components/Carbon.Bootstrap @@ -1 +1 @@ -Subproject commit d8fac55aa1835ab8c16303b7e7e49053fb355669 +Subproject commit 924099b91f37710711fd9910c90e58e849801813 diff --git a/Carbon.Core/Carbon.Components/Carbon.Common b/Carbon.Core/Carbon.Components/Carbon.Common index f00215e6b..b4e20dd8e 160000 --- a/Carbon.Core/Carbon.Components/Carbon.Common +++ b/Carbon.Core/Carbon.Components/Carbon.Common @@ -1 +1 @@ -Subproject commit f00215e6bb29200b8ae01cbbff2dc906737555c1 +Subproject commit b4e20dd8ed1d47928838397e04a416458a0e384e diff --git a/Carbon.Core/Carbon.Components/Carbon.SDK b/Carbon.Core/Carbon.Components/Carbon.SDK index beb9f08a9..2a4523b5c 160000 --- a/Carbon.Core/Carbon.Components/Carbon.SDK +++ b/Carbon.Core/Carbon.Components/Carbon.SDK @@ -1 +1 @@ -Subproject commit beb9f08a978c28f020b44e85fbdf8227485c5894 +Subproject commit 2a4523b5c2b9873dc992099e18ad6721db1ef418 diff --git a/Carbon.Core/Carbon.Hooks/Carbon.Hooks.Base b/Carbon.Core/Carbon.Hooks/Carbon.Hooks.Base index ba8c0bc02..fa337f2bb 160000 --- a/Carbon.Core/Carbon.Hooks/Carbon.Hooks.Base +++ b/Carbon.Core/Carbon.Hooks/Carbon.Hooks.Base @@ -1 +1 @@ -Subproject commit ba8c0bc021498775174c93574e7be15379edacd6 +Subproject commit fa337f2bbfe519bee76c00e3a501062717ef9424 diff --git a/Carbon.Core/Carbon.Hooks/Carbon.Hooks.Community b/Carbon.Core/Carbon.Hooks/Carbon.Hooks.Community index c7ac5643a..20e2ce2fe 160000 --- a/Carbon.Core/Carbon.Hooks/Carbon.Hooks.Community +++ b/Carbon.Core/Carbon.Hooks/Carbon.Hooks.Community @@ -1 +1 @@ -Subproject commit c7ac5643a6799708162bb583cbc05ec1b805e3bd +Subproject commit 20e2ce2fe74f9a0f7cd170dd7cabb7b994e9e967 diff --git a/Carbon.Core/Carbon/src/Community.cs b/Carbon.Core/Carbon/src/Community.cs index 134c063c3..8a82b2208 100644 --- 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 index 4e6a7a718..cae776a48 100644 --- 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 index 4fdbe10b4..b7a101cfd 100644 --- 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 index 94d45511c..ec1f48940 100644 --- 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 {