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

Imporve compatibility

This commit is contained in:
yangzhi 2023-06-20 14:48:34 +08:00
parent 18f34debcc
commit f59c4f194b
6 changed files with 77 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Loader/Properties/AndroidManifest.xml
View File

@ -15,6 +15,7 @@
android:allowBackup="true"
android:resizeableActivity="false"
android:debuggable="true"
android:requestLegacyExternalStorage="true"></application>
android:requestLegacyExternalStorage="true">
</application>
<uses-permission android:name="com.android.vending.CHECK_LICENSE" />
</manifest>

4
src/Loader/Resources/Resource.designer.cs generated
View File

@ -26,6 +26,7 @@ namespace Loader
public static void UpdateIdValues()
{
global::StardewModdingAPI.Resource.String.app_name = global::Loader.Resource.String.app_name;
global::StardewModdingAPI.Resource.String.hello = global::Loader.Resource.String.hello;
}
public partial class Attribute
@ -125,6 +126,9 @@ namespace Loader
// aapt resource value: 0x7F040001
public const int app_name = 2130968577;
// aapt resource value: 0x7F040002
public const int hello = 2130968578;
static String()
{
global::Android.Runtime.ResourceIdManager.UpdateIdValues();

5
src/SMAPI/Framework/ModLoading/RewriteFacades/Game1Methods.cs
View File

@ -13,10 +13,11 @@ namespace StardewModdingAPI.Framework.ModLoading.RewriteFacades
{
public static new IList<IClickableMenu> onScreenMenus => Game1.onScreenMenus;
public static new RainDrop[] RainDropsProp => Game1.rainDrops.ToArray();
public static new IList<GameLocation> LocationsGetter(Game1 game1)
public static new IList<GameLocation> LocationsGetter()
{
return game1._locations;
return Game1.game1._locations;
}
#if SMAPI_LEGACY_PATCH

1
src/SMAPI/Framework/SCore.cs
View File

@ -292,6 +292,7 @@ namespace StardewModdingAPI.Framework
#if SMAPI_FOR_MOBILE
new StringPatcher(this.Reflection),
new ThreadSilenceExitPatch(this.Monitor),
new UIThreadPatch(this.Monitor),
#endif
new TitleMenuPatcher(this.OnLoadStageChanged)
);

5
src/SMAPI/Metadata/InstructionMetadata.cs
View File

@ -58,7 +58,7 @@ namespace StardewModdingAPI.Metadata
#if SMAPI_FOR_MOBILE
// module rewrite for .Net 5 runtime assemblies
yield return new ModuleReferenceRewriter("System.*", "System.", new Version(5,0), new[]
yield return new ModuleReferenceRewriter("System.*", "System.", new Version(4,0), new[]
{
typeof(System.Collections.CollectionBase).Assembly,
typeof(System.Collections.Generic.ISet<>).Assembly,
@ -66,7 +66,7 @@ namespace StardewModdingAPI.Metadata
typeof(System.Xml.XmlDocument).Assembly,
typeof(System.Xml.Linq.XComment).Assembly,
typeof(System.Collections.Generic.IReadOnlySet<>).Assembly,
typeof(System.Data.DataTable).Assembly,
typeof(System.Data.DataTable).Assembly
});
yield return new TypeFieldToAnotherTypePropertyRewriter(typeof(Game1), typeof(Game1Methods), "onScreenMenus", "onScreenMenus");
@ -82,6 +82,7 @@ namespace StardewModdingAPI.Metadata
// Game1.location fix
yield return new TypePropertyToAnotherTypeMethodRewriter(typeof(Game1), typeof(Game1Methods), "locations", "LocationsGetter", null);
yield return new TypeFieldToAnotherTypePropertyRewriter(typeof(Game1), typeof(Game1Methods), "rainDrops", "RainDropsProp");
// Rewrite Missing Type
yield return new TypeReferenceRewriter("StardewValley.Menus.CraftingPage", typeof(CraftingPageMobile));

64
src/SMAPI/Patches/UIThreadPatch.cs Normal file
View File

@ -0,0 +1,64 @@
#if SMAPI_FOR_MOBILE
using System;
using System.Diagnostics.CodeAnalysis;
using System.Threading;
using HarmonyLib;
using StardewModdingAPI.Internal.Patching;
namespace StardewModdingAPI.Patches
{
/// <summary>A Harmony patch for <see cref="Microsoft.Xna.Framework.Threading"/> .</summary>
/// <remarks>Patch methods must be static for Harmony to work correctly. See the Harmony documentation before renaming patch arguments.</remarks>
[SuppressMessage("ReSharper", "InconsistentNaming", Justification = "Argument names are defined by Harmony and methods are named for clarity.")]
[SuppressMessage("ReSharper", "IdentifierTypo", Justification = "Argument names are defined by Harmony and methods are named for clarity.")]
internal class UIThreadPatch : BasePatcher
{
/*********
** Fields
*********/
/*********
** Fields
*********/
/// <summary>Writes messages to the console and log file.</summary>
private static IMonitor Monitor;
/*********
** Accessors
*********/
/// <summary>A unique name for this patch.</summary>
public string Name => nameof(UIThreadPatch);
/*********
** Public methods
*********/
/// <summary>Construct an instance.</summary>
/// <param name="monitorForGame">Writes messages to the console and log file on behalf of the game.</param>
public UIThreadPatch(IMonitor monitor)
{
Monitor = monitor;
}
/// <summary>Apply the Harmony patch.</summary>
/// <param name="harmony">The Harmony instance.</param>
public override void Apply(Harmony harmony, IMonitor monitor)
{
harmony.Patch(
original: AccessTools.Method(typeof(Microsoft.Xna.Framework.Point).Assembly.GetType("Microsoft.Xna.Framework.Threading"), "EnsureUIThread"),
prefix: this.GetHarmonyMethod(nameof(UIThreadPatch.UIThreadPatch_Prefix))
);
}
/*********
** Private methods
*********/
/// <summary>The method to call instead of <see cref="Microsoft.Xna.Framework.Threading.EnsureUIThread"/>.</summary>
/// <returns>Returns whether to execute the original method.</returns>
private static bool UIThreadPatch_Prefix()
{
return false;
}
}
}
#endif