Move source to src directory and clean up a bit

OxideMod · Apr 6, 2018 · 682550e · 682550e
1 parent 12bd3a8
commit 682550e
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 13 deletions.
diff --git a/Oxide.Unity.sln b/Oxide.Unity.sln
@@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.27004.2008
 MinimumVisualStudioVersion = 15.0
-Project("{AC016865-AE43-4FEF-BD68-8B9AEFDA0B1A}") = "Oxide.Unity", "Oxide.Unity\Oxide.Unity.csproj", "{52C26C5B-23E5-48A2-B403-5FF5C898E91A}"
+Project("{AC016865-AE43-4FEF-BD68-8B9AEFDA0B1A}") = "Oxide.Unity", "src\Oxide.Unity.csproj", "{52C26C5B-23E5-48A2-B403-5FF5C898E91A}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

diff --git a/Oxide.Unity/Dependencies/UnityEngine.dll → src/Dependencies/UnityEngine.dll b/Oxide.Unity/Dependencies/UnityEngine.dll → src/Dependencies/UnityEngine.dll
diff --git a/Oxide.Unity/ExtensionMethods.cs → src/ExtensionMethods.cs b/Oxide.Unity/ExtensionMethods.cs → src/ExtensionMethods.cs
@@ -16,7 +16,7 @@ public static class ExtensionMethods
         /// <returns></returns>
         public static Vector3 ToVector3(this string vector3)
         {
-            var split = vector3.Split(',').Select(Convert.ToSingle).ToArray();
+            float[] split = vector3.Split(',').Select(Convert.ToSingle).ToArray();
             return split.Length == 3 ? new Vector3(split[0], split[1], split[2]) : Vector3.zero;
         }
 

diff --git a/Oxide.Unity/Logging/UnityLogger.cs → src/Logging/UnityLogger.cs b/Oxide.Unity/Logging/UnityLogger.cs → src/Logging/UnityLogger.cs
@@ -1,6 +1,5 @@
 using System.Threading;
 using UnityEngine;
-
 using Logger = Oxide.Core.Logging.Logger;
 using LogType = Oxide.Core.Logging.LogType;
 

diff --git a/Oxide.Unity/Oxide.Unity.csproj → src/Oxide.Unity.csproj b/Oxide.Unity/Oxide.Unity.csproj → src/Oxide.Unity.csproj
@@ -20,10 +20,12 @@
     -->
     <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.Core.Unity</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.Core" Version="2.0.3797-develop" />
     <Reference Include="UnityEngine">
       <HintPath>Dependencies\UnityEngine.dll</HintPath>
     </Reference>
@@ -32,7 +34,7 @@
   <Target Name="ChangeAliasesOfStrongNameAssemblies" BeforeTargets="FindReferenceAssembliesForReferences;ResolveReferences">
     <ItemGroup>
       <ReferencePath Condition="'%(FileName)' == 'Oxide.References'">
-        <Aliases>Oxide</Aliases>
+        <Aliases>References</Aliases>
       </ReferencePath>
     </ItemGroup>
   </Target>

diff --git a/Oxide.Unity/Plugins/UnityCore.cs → src/Plugins/UnityCore.cs b/Oxide.Unity/Plugins/UnityCore.cs → src/Plugins/UnityCore.cs
diff --git a/Oxide.Unity/Plugins/UnityPluginLoader.cs → src/Plugins/UnityPluginLoader.cs b/Oxide.Unity/Plugins/UnityPluginLoader.cs → src/Plugins/UnityPluginLoader.cs
diff --git a/Oxide.Unity/UnityExtension.cs → src/UnityExtension.cs b/Oxide.Unity/UnityExtension.cs → src/UnityExtension.cs
diff --git a/Oxide.Unity/UnityScript.cs → src/UnityScript.cs b/Oxide.Unity/UnityScript.cs → src/UnityScript.cs
@@ -24,13 +24,16 @@ private void Awake()
         {
             oxideMod = Interface.Oxide;
 
-            var eventInfo = typeof(Application).GetEvent("logMessageReceived");
+            EventInfo eventInfo = typeof(Application).GetEvent("logMessageReceived");
             if (eventInfo == null)
             {
                 // Unity 4
-                var logCallbackField = typeof(Application).GetField("s_LogCallback", BindingFlags.Static | BindingFlags.NonPublic);
-                var logCallback = logCallbackField?.GetValue(null) as Application.LogCallback;
-                if (logCallback == null) Interface.Oxide.LogWarning("No Unity application log callback is registered");
+                FieldInfo logCallbackField = typeof(Application).GetField("s_LogCallback", BindingFlags.Static | BindingFlags.NonPublic);
+                Application.LogCallback logCallback = logCallbackField?.GetValue(null) as Application.LogCallback;
+                if (logCallback == null)
+                {
+                    Interface.Oxide.LogWarning("No Unity application log callback is registered");
+                }
 
 #pragma warning disable 0618
                 Application.RegisterLogCallback((message, stack_trace, type) =>
@@ -42,7 +45,7 @@ private void Awake()
             else
             {
                 // Unity 5
-                var handleException = Delegate.CreateDelegate(eventInfo.EventHandlerType, this, "LogMessageReceived");
+                Delegate handleException = Delegate.CreateDelegate(eventInfo.EventHandlerType, this, "LogMessageReceived");
                 eventInfo.GetAddMethod().Invoke(null, new object[] { handleException });
             }
         }
@@ -51,7 +54,11 @@ private void Awake()
 
         private void OnDestroy()
         {
-            if (oxideMod.IsShuttingDown) return;
+            if (oxideMod.IsShuttingDown)
+            {
+                return;
+            }
+
             oxideMod.LogWarning("The Oxide Unity Script was destroyed (creating a new instance)");
             oxideMod.NextTick(Create);
         }
@@ -65,9 +72,12 @@ private void OnApplicationQuit()
             }
         }
 
-        private void LogMessageReceived(string message, string stackTrace, LogType type)
+        private static void LogMessageReceived(string message, string stackTrace, LogType type)
         {
-            if (type == LogType.Exception) RemoteLogger.Exception(message, stackTrace);
+            if (type == LogType.Exception)
+            {
+                RemoteLogger.Exception(message, stackTrace);
+            }
         }
     }
 }