Changes and additions

+Moved the ReflectionExtensions file to EXILED_Main extensions folder and renamed it to Reflection. +Added Config extensions.
iopietro · Apr 27, 2020 · afe54fb · afe54fb
1 parent 179df69
commit afe54fb
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 8 deletions.
diff --git a/EXILED_Events/EXILED_Events.csproj b/EXILED_Events/EXILED_Events.csproj
@@ -39,7 +39,7 @@
       <HintPath>..\References\0Harmony.dll</HintPath>
     </Reference>
     <Reference Include="Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
-      <HintPath>..\..\References\Assembly-CSharp_publicized.dll</HintPath>
+      <HintPath>..\References\Assembly-CSharp.dll</HintPath>
     </Reference>
     <Reference Include="Assembly-CSharp-firstpass, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
       <HintPath>..\References\Assembly-CSharp-firstpass.dll</HintPath>
@@ -245,7 +245,6 @@
     <Compile Include="Patches\ShootEvents.cs" />
     <Compile Include="Plugin.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="ReflectionExtensions.cs" />
     <Compile Include="ReloadCommandHandler.cs" />
   </ItemGroup>
   <ItemGroup>
@@ -255,7 +254,7 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Components" />
+    <Folder Include="Components\" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

diff --git a/EXILED_Idler/EXILED_Idler.csproj b/EXILED_Idler/EXILED_Idler.csproj
@@ -35,7 +35,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
-      <HintPath>..\References\Assembly-CSharp_publicized.dll</HintPath>
+      <HintPath>..\References\Assembly-CSharp.dll</HintPath>
     </Reference>
     <Reference Include="Mono.WebBrowser, Version=4.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756">
       <HintPath>..\References\Mono.WebBrowser.dll</HintPath>

diff --git a/EXILED_Main/EXILED_Main.csproj b/EXILED_Main/EXILED_Main.csproj
@@ -41,7 +41,7 @@
       <HintPath>..\References\Assembly-CSharp-firstpass.dll</HintPath>
     </Reference>
     <Reference Include="Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
-      <HintPath>..\References\Assembly-CSharp_publicized.dll</HintPath>
+      <HintPath>..\References\Assembly-CSharp.dll</HintPath>
     </Reference>
     <Reference Include="Mirror, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
       <HintPath>..\References\Mirror.dll</HintPath>
@@ -94,8 +94,10 @@
     <Compile Include="ApiObjects\ZoneType.cs" />
     <Compile Include="Attributes\SkipAutoHarmonyAttribute.cs" />
     <Compile Include="Extensions\Cassie.cs" />
+    <Compile Include="Extensions\Config.cs" />
     <Compile Include="Extensions\Map.cs" />
     <Compile Include="Extensions\Player.cs" />
+    <Compile Include="Extensions\Reflection.cs" />
     <Compile Include="Extensions\Scp079.cs" />
     <Compile Include="Extensions\Scp914.cs" />
     <Compile Include="LevenshteinDistance.cs" />
@@ -113,4 +115,4 @@
     <Target Name="AfterBuild">
     </Target>
     -->
-</Project>
+</Project>
diff --git a/EXILED_Main/Extensions/Config.cs b/EXILED_Main/Extensions/Config.cs
@@ -0,0 +1,25 @@
+using System.Collections.Generic;
+
+namespace EXILED.Extensions
+{
+	public static class Config
+	{
+		public static Dictionary<string, string> GetStringDictionary(this YamlConfig config, string key, Dictionary<string, string> defaultValue)
+		{
+			var dictionary = config.GetStringDictionary(key);
+
+			if (dictionary?.Count == 0) return defaultValue;
+
+			return dictionary;
+		}
+
+		public static List<string> GetStringList(this YamlConfig config, string key, List<string> defaultValue)
+		{
+			var list = config.GetStringList(key);
+
+			if (list?.Count == 0) return defaultValue;
+
+			return list;
+		}
+	}
+}
diff --git a/EXILED_Events/ReflectionExtensions.cs → EXILED_Main/Extensions/Reflection.cs b/EXILED_Events/ReflectionExtensions.cs → EXILED_Main/Extensions/Reflection.cs
@@ -1,9 +1,9 @@
 using System;
 using System.Reflection;
 
-namespace EXILED
+namespace EXILED.Extensions
 {
-	public static class ReflectionExtensions
+	public static class Reflection
 	{
 		public static void InvokeStaticMethod(this Type type, string methodName, object[] param)
 		{