Bump version

IPA.Injector/GameVersionEarly.cs

@@ -31,27 +31,53 @@ namespace IPA.Injector
             {
                 const string key = "public.app-category.games";
                 int pos = 0;
+                var streamLength = stream.Length;
 
-                while (stream.Position < stream.Length && pos < key.Length)
+                while (stream.Position < streamLength && pos < key.Length)
                 {
                     if (reader.ReadByte() == key[pos]) pos++;
                     else pos = 0;
                 }
 
-                if (stream.Position == stream.Length) // we went through the entire stream without finding the key
+                if (stream.Position == streamLength) // we went through the entire stream without finding the key
                     throw new KeyNotFoundException("Could not find key '" + key + "' in " + mgr);
 
-                while (stream.Position < stream.Length)
+                var startIndex = 0L;
+                var endIndex = 0L;
+
+                while (stream.Position < streamLength && endIndex == 0L)
                 {
                     var current = (char)reader.ReadByte();
                     if (char.IsDigit(current))
-                        break;
-                }
+                    {
+                        startIndex = stream.Position - 1;
+                        var dotCount = 0;
 
-                var rewind = -sizeof(int) - sizeof(byte);
-                _ = stream.Seek(rewind, SeekOrigin.Current); // rewind to the string length
+                        while (stream.Position < streamLength)
+                        {
+                            current = (char)reader.ReadByte();
+                            if (char.IsDigit(current))
+                            {
+                                if (dotCount == 2 && stream.Position < streamLength && !char.IsDigit((char)reader.PeekChar()))
+                                {
+                                    endIndex = stream.Position;
+                                    break;
+                                }
+                            }
+                            else if (current == '.')
+                            {
+                                dotCount++;
+                            }
+                            else
+                            {
+                                break;
+                            }
+                        }
+                    }
+                }
 
-                var strlen = reader.ReadInt32();
+                var strlen = (int)(endIndex - startIndex);
+                _ = stream.Seek(-strlen, SeekOrigin.Current);
                 var strbytes = reader.ReadBytes(strlen);
 
                 return Encoding.UTF8.GetString(strbytes);
@@ -60,7 +86,7 @@ namespace IPA.Injector
 
         internal static AlmostVersion SafeParseVersion() => new(GetGameVersion());
 
-        private static void _Load() 
+        private static void _Load()
         {
             UnityGame.SetEarlyGameVersion(SafeParseVersion());
             UnityGame.CheckGameVersionBoundary();

IPA.Injector/IPA.Injector.csproj

@@ -39,33 +39,10 @@
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net472' ">
-    <Content Include="..\Libs\I18N.Net4.dll">
-      <Link>Libraries\Mono\I18N.dll</Link>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="..\Libs\I18N.West.Net4.dll">
-      <Link>Libraries\Mono\I18N.West.dll</Link>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
     <Content Include="..\Libs\Microsoft.CSharp.dll">
       <Link>Libraries\Mono\Microsoft.CSharp.dll</Link>
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\Libs\System.Runtime.Serialization.Net4.dll">
-      <Link>Libraries\Mono\System.Runtime.Serialization.dll</Link>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="..\Libs\netstandard.dll">
-      <Link>Libraries\Mono\netstandard.dll</Link>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-  </ItemGroup>
-
-  <ItemGroup>
-    <Content Include="..\Libs\thirdparty\*">
-      <Link>Libraries\Thirdparty\%(Filename)%(Extension)</Link>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net35' ">
@@ -105,11 +82,9 @@
       <SystemFiles Include="$(OutputPath)System.*" />
       <SystemFiles Include="$(OutputPath)Portable.System.*" />
       <SystemFiles Include="$(OutputPath)Net3-Proxy.*" />
-      <SystemFiles Include="$(OutputPath)Libraries\Mono\**\*" />
       <OldLibFiles Include="$(OutputPath)Libs\**\*" />
     </ItemGroup>
     <Move SourceFiles="@(SystemFiles)" DestinationFolder="$(OutputPath)Data\Managed" />
-    <RemoveDir Directories="$(OutputPath)Libraries\Mono" />
 
     <Delete Files="@(OldLibFiles)" />
     <RemoveDir Directories="$(OutputPath)Libs" />

IPA.Loader/Config/SelfConfig.cs

@@ -87,7 +87,7 @@ namespace IPA.Config
         }
 
         internal const string IPAName = "Beat Saber IPA";
-        internal const string IPAVersion = "4.3.4.0";
+        internal const string IPAVersion = "4.3.5.0";
 
         // uses Updates.AutoUpdate, Updates.AutoCheckUpdates, YeetMods, Debug.ShowCallSource, Debug.ShowDebug,
         //      Debug.CondenseModLogs

IPA.Loader/Loader/LibLoader.cs

@@ -90,9 +90,6 @@ namespace IPA.Loader
 
                 //var unityData = Directory.EnumerateDirectories(Environment.CurrentDirectory, "*_Data").First();
                 //AddDir(Path.Combine(unityData, "Plugins"));
-
-                // TODO: find a way to either safely remove Newtonsoft, or switch to a different JSON lib
-                _ = LoadLibrary(new AssemblyName("Newtonsoft.Json, Version=12.0.0.0, Culture=neutral"));
             }
         }
 
@@ -215,7 +212,7 @@ namespace IPA.Loader
                 { continue; }
                 catch (DirectoryNotFoundException)
                 { continue; }
-                
+
                 foreach (string str in subDirs)
                     if (dirValidator(str)) dirs.Push(str);
 

IPA.Loader/Loader/manifest.json

@@ -7,7 +7,7 @@
   ],
   "id": "BSIPA",
   "name": "Beat Saber IPA",
-  "version": "4.3.4",
+  "version": "4.3.5",
   "icon": "IPA.icon_white.png",
   "features": {
     "IPA.DefineFeature": [

IPA/Program.cs

@@ -21,7 +21,7 @@ namespace IPA
             Unknown
         }
 
-        public const string FileVersion = "4.3.4.0";
+        public const string FileVersion = "4.3.5.0";
 
         public static Version Version => Assembly.GetEntryAssembly()!.GetName().Version!;