StardewValley
/
SMAPI
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug fix

This commit is contained in:
zhiyang7 2023-04-04 11:22:32 +08:00
parent e618785e93
commit 2801638122
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/SMAPI/SMainActivity.cs
View File

@ -83,12 +83,6 @@ namespace StardewModdingAPI
{ {
try try
{ {
Game1 game1 = (Game1)typeof(MainActivity).GetField("_game1", BindingFlags.Instance | BindingFlags.NonPublic)?.GetValue(this);
if (game1 != null)
{
// game1.Exit();
}
new SGameConsole(); new SGameConsole();
Program.Main(null); Program.Main(null);
@ -108,11 +102,14 @@ namespace StardewModdingAPI
this.core = new SCore(System.IO.Path.Combine(EarlyConstants.StardewValleyBasePath, modPath), false, false); this.core = new SCore(System.IO.Path.Combine(EarlyConstants.StardewValleyBasePath, modPath), false, false);
this.core.RunInteractively(); this.core.RunInteractively();
typeof(MainActivity).GetMethod("SetZoomScaleAndMenuButtonScale", BindingFlags.Instance | BindingFlags.NonPublic).Invoke(this, Array.Empty<object>());
Type.GetType("StardewValley.Mobile.MobileDisplay")?.GetMethod("SetupDisplaySettings", BindingFlags.Static | BindingFlags.Public | BindingFlags.NonPublic)?.Invoke(null, Array.Empty<object>());
typeof(MainActivity).GetMethod("SetZoomScaleAndMenuButtonScale", BindingFlags.Instance | BindingFlags.NonPublic)?.Invoke(this, Array.Empty<object>());
this.SetPaddingForMenus(); this.SetPaddingForMenus();
typeof(MainActivity).GetField("_game1", BindingFlags.Instance | BindingFlags.NonPublic)?.SetValue(this, this.core.Game.gamePtr);
this.SetContentView((View)this.core.Game.Services.GetService(typeof(View))); this.SetContentView((View)this.core.Game.Services.GetService(typeof(View)));
GameRunner.instance = this.core.Game;
typeof(MainActivity).GetField("_game1", BindingFlags.Instance | BindingFlags.NonPublic)?.SetValue(this, this.core.Game.gamePtr);
this.core.Game.Run(); this.core.Game.Run();
} }
catch when (retry < 3) catch when (retry < 3)
@ -149,7 +146,7 @@ namespace StardewModdingAPI
private void PromptForPermissionsWithReasonFirst() => this.PromptForPermissions(); private void PromptForPermissionsWithReasonFirst() => this.PromptForPermissions();
public void CheckAppPermissions() public new void CheckAppPermissions()
{ {
this.LogPermissions(); this.LogPermissions();
if (this.HasPermissions) if (this.HasPermissions)
@ -186,7 +183,7 @@ namespace StardewModdingAPI
} }
} }
public void PromptForPermissions() public new void PromptForPermissions()
{ {
string[] permissionsArray = this.deniedPermissionsArray; string[] permissionsArray = this.deniedPermissionsArray;
if (permissionsArray.Length == 0) if (permissionsArray.Length == 0)