Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Entity.SourceData and SourceId, provide way to efficiently search by EntityData name #879

Open
wants to merge 4 commits into
base: dev
Choose a base branch
from
+678 −183
Open

Entity.SourceData and SourceId, provide way to efficiently search by EntityData name #879

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
57dd77e
Entity.SourceData and SourceId, provide way to efficiently search by …
JaThePlayer Feb 8, 2025
2c60252
Revert Tracker.GetEntities crash fix, should be handled differently
JaThePlayer Feb 8, 2025
bc330a6
Handle hot reloads and pre-populate the sid<->type maps sooner
JaThePlayer Feb 8, 2025
312bfc2
Merge branch 'dev' into entityDataTracking
JaThePlayer Feb 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 46 additions & 6 deletions Celeste.Mod.mm/Mod/Everest/Everest.Loader.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
using Celeste.Mod.Core;
using Celeste.Mod.Entities;
using Celeste.Mod.Helpers;
using Celeste.Mod.Registry;
using MAB.DotIgnore;
using Microsoft.Xna.Framework;
using Monocle;
Expand Down Expand Up @@ -609,36 +610,68 @@ internal static void ProcessAssembly(EverestModuleMetadata meta, Assembly asm, T

patch_Level.EntityLoader loader = null;

ConstructorInfo ctor;
ConstructorInfo ctor = null;
MethodInfo gen;

gen = type.GetMethod(genName, new Type[] { typeof(Level), typeof(LevelData), typeof(Vector2), typeof(EntityData) });
if (gen != null && gen.IsStatic && gen.ReturnType.IsCompatible(typeof(Entity))) {
loader = (level, levelData, offset, entityData) => (Entity) gen.Invoke(null, new object[] { level, levelData, offset, entityData });
loader = (level, levelData, offset, entityData) => {
var entityId = ((patch_Level)level).CreateEntityId(levelData, entityData);
var entity = (patch_Entity) gen.Invoke(null, new object[] { level, levelData, offset, entityData });
if (entity != null) {
entity.SourceData = entityData;
entity.SourceId = entityId;
}

return entity;
};
goto RegisterEntityLoader;
}

ctor = type.GetConstructor(new Type[] { typeof(EntityData), typeof(Vector2), typeof(EntityID) });
if (ctor != null) {
loader = (level, levelData, offset, entityData) => (Entity) ctor.Invoke(new object[] { entityData, offset, new EntityID(levelData.Name, entityData.ID + (patch_Level._isLoadingTriggers ? 10000000 : 0)) });
loader = (level, levelData, offset, entityData) => {
var entityId = ((patch_Level)level).CreateEntityId(levelData, entityData);
var entity = (patch_Entity) ctor.Invoke(new object[] { entityData, offset, entityId });
entity.SourceData = entityData;
entity.SourceId = entityId;

return entity;
};
goto RegisterEntityLoader;
}

ctor = type.GetConstructor(new Type[] { typeof(EntityData), typeof(Vector2) });
if (ctor != null) {
loader = (level, levelData, offset, entityData) => (Entity) ctor.Invoke(new object[] { entityData, offset });
loader = (level, levelData, offset, entityData) => {
var entity = (patch_Entity)ctor.Invoke(new object[] { entityData, offset });
entity.SourceData = entityData;
entity.SourceId = ((patch_Level)level).CreateEntityId(levelData, entityData);

return entity;
};
goto RegisterEntityLoader;
}

ctor = type.GetConstructor(new Type[] { typeof(Vector2) });
if (ctor != null) {
loader = (level, levelData, offset, entityData) => (Entity) ctor.Invoke(new object[] { offset });
loader = (level, levelData, offset, entityData) => {
var entity = (patch_Entity)ctor.Invoke(new object[] { offset });
entity.SourceData = entityData;
entity.SourceId = ((patch_Level)level).CreateEntityId(levelData, entityData);
return entity;
};
goto RegisterEntityLoader;
}

ctor = type.GetConstructor(Type.EmptyTypes);
if (ctor != null) {
loader = (level, levelData, offset, entityData) => (Entity) ctor.Invoke(null);
loader = (level, levelData, offset, entityData) => {
var entity = (patch_Entity)ctor.Invoke(null);
entity.SourceData = entityData;
entity.SourceId = ((patch_Level)level).CreateEntityId(levelData, entityData);
return entity;
};
goto RegisterEntityLoader;
}

Expand All @@ -647,6 +680,13 @@ internal static void ProcessAssembly(EverestModuleMetadata meta, Assembly asm, T
Logger.Warn("core", $"Found custom entity without suitable constructor / {genName}(Level, LevelData, Vector2, EntityData): {id} ({type.FullName})");
continue;
}

// Immediately register the connection when we're calling the ctor,
// since we know the return type upfront.
if (ctor != null) {
EntityRegistry.RegisterSidToTypeConnection(id, ctor.DeclaringType);
}

patch_Level.EntityLoaders[id] = loader;
}
}
Expand Down
4 changes: 4 additions & 0 deletions Celeste.Mod.mm/Mod/Everest/Everest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using Celeste.Mod.Core;
using Celeste.Mod.Helpers;
using Celeste.Mod.Helpers.LegacyMonoMod;
using Celeste.Mod.Registry;
using Celeste.Mod.UI;
using Microsoft.Xna.Framework;
using Monocle;
Expand Down Expand Up @@ -792,6 +793,9 @@ internal static void Unregister(this EverestModule module) {
((Monocle.patch_Commands) Engine.Commands).ReloadCommandsList();
}

if (module is not NullModule)
EntityRegistry.OnModAssemblyUnload(module.GetType().Assembly);

InvalidateInstallationHash();

module.LogUnregistration();
Expand Down
Loading