Browse Source

Minor tweaks to some settings

pull/1/head
DaNike 5 years ago
parent
commit
067056f796
4 changed files with 14 additions and 7 deletions
  1. +5
    -0
      BSIPA.sln.DotSettings
  2. +8
    -6
      IPA.Injector/Injector.cs
  3. +1
    -1
      IPA.Loader/Updating/SelfPlugin.cs
  4. BIN
      Refs/UnityEngine.CoreModule.dll

+ 5
- 0
BSIPA.sln.DotSettings View File

@ -9,8 +9,13 @@
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=Constants/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb"&gt;&lt;ExtraRule Prefix="" Suffix="" Style="AaBb_AaBb" /&gt;&lt;/Policy&gt;</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateInstanceFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="_" Suffix="" Style="aaBb"&gt;&lt;ExtraRule Prefix="" Suffix="" Style="aaBb" /&gt;&lt;/Policy&gt;</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateStaticFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateStaticReadonly/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PublicFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb"&gt;&lt;ExtraRule Prefix="" Suffix="" Style="aaBb_aaBb" /&gt;&lt;/Policy&gt;</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=StaticReadonly/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb"&gt;&lt;ExtraRule Prefix="" Suffix="" Style="aaBb_aaBb" /&gt;&lt;/Policy&gt;</s:String>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpKeepExistingMigration/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpPlaceEmbeddedOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=beatsaber/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Coroutine/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=deps/@EntryIndexedValue">True</s:Boolean>


+ 8
- 6
IPA.Injector/Injector.cs View File

@ -35,6 +35,8 @@ namespace IPA.Injector
SetupLibraryLoading();
log.Debug("Initializing logger");
SelfConfig.Set();
loader.Debug("Prepping bootstrapper");
@ -53,8 +55,8 @@ namespace IPA.Injector
private static void SetupLibraryLoading()
{
if (_loadingDone) return;
_loadingDone = true;
if (loadingDone) return;
loadingDone = true;
AppDomain.CurrentDomain.AssemblyResolve += LibLoader.AssemblyLibLoader;
}
@ -174,12 +176,12 @@ namespace IPA.Injector
#endregion Virtualize Assembly-CSharp.dll
}
private static bool _bootstrapped;
private static bool bootstrapped;
private static void CreateBootstrapper()
{
if (_bootstrapped) return;
_bootstrapped = true;
if (bootstrapped) return;
bootstrapped = true;
Application.logMessageReceived += delegate (string condition, string stackTrace, LogType type)
{
@ -195,7 +197,7 @@ namespace IPA.Injector
bootstrapper.Destroyed += Bootstrapper_Destroyed;
}
private static bool _loadingDone;
private static bool loadingDone;
private static void Bootstrapper_Destroyed()
{


+ 1
- 1
IPA.Loader/Updating/SelfPlugin.cs View File

@ -4,7 +4,7 @@ using UnityEngine.SceneManagement;
namespace IPA.Updating
{
[Obsolete("Only used for old updating system, replaced with a PluginMeta for teh embedded manifest")]
[Obsolete("Only used for old updating system, replaced with a PluginMeta for the embedded manifest")]
internal class SelfPlugin : IBeatSaberPlugin
{
public static SelfPlugin Instance { get; set; } = new SelfPlugin();


BIN
Refs/UnityEngine.CoreModule.dll View File


Loading…
Cancel
Save