Merge pull request #53 from CommunalHelper/aonkeeper4/ignored-anchor-modinterop

Add ModInterop for adding ignored anchor fields

Author: aonkeeper4

Code/Components/EntityContainerMover.cs

@@ -5,6 +5,7 @@
 using MonoMod.Utils;
 using System;
 using System.Collections.Generic;
+using System.Linq;
 
 namespace Celeste.Mod.EeveeHelper.Components;
 
@@ -19,6 +20,8 @@ public class EntityContainerMover : EntityContainer
 	{
 		"Position", "ExactPosition", "TopLeft", "TopCenter", "TopRight", "Center", "CenterLeft", "CenterRight", "BottomLeft", "BottomCenter", "BottomRight"
 	};
+	private static Dictionary<Type, HashSet<string>> IgnoredAnchorsPerType = new();
+	
 	private static HashSet<string> CommonAnchors = new()
 	{
 		"anchor", "anchorPosition", "start", "startPosition"
@@ -271,16 +274,29 @@ public static List<string> FindAnchors(Entity entity)
 	{
 		var result = new List<string>();
 		var data = new InheritedDynData(entity);
+		
+		var type = entity.GetType();
+		var ignoredAnchorsForType = IgnoredAnchorsPerType.SelectMany(kvp => kvp.Key.IsAssignableFrom(type) ? kvp.Value : []).ToArray();
+		
 		foreach (var pair in data)
 		{
-			if (pair.Value is Vector2 vector && !IgnoredAnchors.Contains(pair.Key) && (vector == EeveeUtils.GetPosition(entity) || CommonAnchors.Contains(pair.Key)))
-			{
+			if (pair.Value is Vector2 vector
+				&& !IgnoredAnchors.Contains(pair.Key)
+				&& !ignoredAnchorsForType.Contains(pair.Key)
+				&& (vector == EeveeUtils.GetPosition(entity) || CommonAnchors.Contains(pair.Key)))
 				result.Add(pair.Key);
-			}
 		}
 		return result;
 	}
 
+	public static void AddIgnoredAnchors(Type type, HashSet<string> anchors)
+	{
+		if (IgnoredAnchorsPerType.TryGetValue(type, out var alreadyIgnoredAnchors))
+			alreadyIgnoredAnchors.UnionWith(anchors);
+		else
+			IgnoredAnchorsPerType.Add(type, anchors);
+	}
+
 	public static void AddEntityHandler(Type entityType, Type handlerType)
 	{
 		foreach (var type in FakeAssembly.GetEntryAssembly().GetTypesSafe())

Code/EeveeHelper.csproj

@@ -8,10 +8,6 @@
         <CelestePrefix Condition="'$(CelestePrefix)' == '' And Exists('..\..\Celeste.dll')">..\..</CelestePrefix>
         <CelestePrefix Condition="'$(CelestePrefix)' == '' And Exists('..\..\..\Celeste.dll')">..\..\..</CelestePrefix>
         <CelestePrefix Condition="'$(CelestePrefix)' == ''">lib-stripped</CelestePrefix>
-
-        <CelesteType Condition="'$(CelesteType)' == '' And Exists('$(CelestePrefix)\BuildIsXNA.txt')">XNA</CelesteType>
-        <CelesteType Condition="'$(CelesteType)' == ''">FNA</CelesteType>
-        <XNAPath Condition="'$(XNAPath)' == ''">$(WINDIR)\Microsoft.NET\assembly\GAC_32\{0}\v4.0_4.0.0.0__842cf8be1de50553\{0}.dll</XNAPath>
     </PropertyGroup>
 
     <!--Disable "Copy Local" for all references-->
@@ -21,32 +17,21 @@
     </ItemDefinitionGroup>
 
     <ItemGroup>
-        <PackageReference Include="MonoMod.RuntimeDetour" Version="22.01.04.03" />
-        <PackageReference Include="BepInEx.AssemblyPublicizer.MSBuild" Version="0.4.1" PrivateAssets="all" />
+        <PackageReference Include="MonoMod.RuntimeDetour" Version="25.3.1" PrivateAssets="all" ExcludeAssets="runtime" />
+        <PackageReference Include="MonoMod.Patcher" Version="25.0.0-prerelease.2" />
+        <PackageReference Include="CelesteAnalyzer" Version="*" />
     </ItemGroup>
 
     <ItemGroup>
-        <Reference Include="$(CelestePrefix)\Celeste.dll" Publicize="true" />
-        <Reference Include="$(CelestePrefix)\MMHOOK_Celeste.dll" />
+        <PackageReference Include="CelesteMod.Publicizer" Version="*" CelesteAssembly="$(CelestePrefix)\Celeste.dll" />
+        <Reference Include="$(CelestePrefix)\MMHOOK_Celeste.dll" Private="false" />
+        <Reference Include="$(CelestePrefix)\FNA.dll" Private="false" />
+    </ItemGroup>
+    
+    <ItemGroup>
         <Reference Include="lib-stripped\StyleMaskHelper.dll" />
     </ItemGroup>
 
-    <Choose>
-        <When Condition="'$(CelesteType)' == 'FNA'">
-            <ItemGroup>
-                <Reference Include="$(CelestePrefix)\FNA.dll" />
-            </ItemGroup>
-        </When>
-
-        <When Condition="'$(CelesteType)' == 'XNA'">
-            <ItemGroup>
-                <Reference Include="$([System.String]::Format('$(XNAPath)', 'Microsoft.Xna.Framework'))" />
-                <Reference Include="$([System.String]::Format('$(XNAPath)', 'Microsoft.Xna.Framework.Game'))" />
-                <Reference Include="$([System.String]::Format('$(XNAPath)', 'Microsoft.Xna.Framework.Graphics'))" />
-            </ItemGroup>
-        </When>
-    </Choose>
-
     <Target Name="CopyFiles" AfterTargets="Build">
         <Copy SourceFiles="$(OutputPath)\$(AssemblyName).dll" DestinationFolder="bin" />
         <Copy SourceFiles="$(OutputPath)\$(AssemblyName).pdb" DestinationFolder="bin" />

Code/EeveeHelperModule.cs

@@ -5,6 +5,7 @@
 using Celeste.Mod.EeveeHelper.Handlers;
 using Celeste.Mod.EeveeHelper.Handlers.Impl;
 using Monocle;
+using MonoMod.ModInterop;
 using System;
 using System.Collections.Generic;
 
@@ -32,6 +33,8 @@ public EeveeHelperModule()
 
 	public override void Load()
 	{
+		typeof(Exports).ModInterop();
+		
 		MiscHooks.Load();
 		RoomChest.Load();
 		HoldableTiles.Load();

Code/Exports.cs

@@ -0,0 +1,13 @@
+using Celeste.Mod.EeveeHelper.Components;
+using MonoMod.ModInterop;
+using System;
+using System.Collections.Generic;
+
+namespace Celeste.Mod.EeveeHelper;
+
+[ModExportName("EeveeHelper")]
+public static class Exports
+{
+	public static void RegisterIgnoredAnchors(Type forType, HashSet<string> fieldNames)
+		=> EntityContainerMover.AddIgnoredAnchors(forType, fieldNames);
+}