Skip to content

Cleanup vef namespace causing desyncs #536

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

Merged
SokyranTheDragon merged 10 commits into from
Jan 14, 2026
Merged

Cleanup vef namespace causing desyncs #536

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
0415002
fixed vanilla expanded framework stuff being odd and pissing me off
Chillayy Jan 10, 2026
1dedb87
fixed vanilla expanded framework stuff being odd and pissing me off
Chillayy Jan 10, 2026
2d4d194
fixed runandgun pissing me off
Chillayy Jan 10, 2026
2314c12
Add VEF 1.6 namespace support, fixing things like VPE, Dragon's Desce…
Chillayy Jan 10, 2026
c97c7c5
removed bloat
Chillayy Jan 10, 2026
248df45
Remove dead code
Chillayy Jan 12, 2026
b2ebd88
changed to source
Chillayy Jan 12, 2026
53f8fae
Fix formatting issue
Chillayy Jan 12, 2026
283914c
removed redundant code
Chillayy Jan 12, 2026
b512032
removed the null checks because apparently i forgot
Chillayy Jan 12, 2026
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
14 changes: 7 additions & 7 deletions Source/Mods/VanillaExpandedFramework.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System;
using System;
using System.Collections;
using System.Collections.Generic;
using System.Linq;
Expand Down Expand Up @@ -684,18 +684,18 @@ private static void PatchAbilities()

// Comp holding ability
// CompAbility
compAbilitiesType = AccessTools.TypeByName("VFECore.Abilities.CompAbilities");
compAbilitiesType = AccessTools.TypeByName("VEF.Abilities.CompAbilities");
learnedAbilitiesField = AccessTools.FieldRefAccess<IEnumerable>(compAbilitiesType, "learnedAbilities");
// Unlock ability, user-input use by Vanilla Psycasts Expanded
MP.RegisterSyncMethod(compAbilitiesType, "GiveAbility");
// CompAbilityApparel
compAbilitiesApparelType = AccessTools.TypeByName("VFECore.Abilities.CompAbilitiesApparel");
compAbilitiesApparelType = AccessTools.TypeByName("VEF.Abilities.CompAbilitiesApparel");
givenAbilitiesField = AccessTools.FieldRefAccess<IEnumerable>(compAbilitiesApparelType, "givenAbilities");
abilityApparelPawnGetter = MethodInvoker.GetHandler(AccessTools.PropertyGetter(compAbilitiesApparelType, "Pawn"));
//MP.RegisterSyncMethod(compAbilitiesApparelType, "Initialize");

// Ability itself
var type = AccessTools.TypeByName("VFECore.Abilities.Ability");
var type = AccessTools.TypeByName("VEF.Abilities.Ability");

abilityInitMethod = MethodInvoker.GetHandler(AccessTools.Method(type, "Init"));
abilityHolderField = AccessTools.FieldRefAccess<Thing>(type, "holder");
Expand Down Expand Up @@ -762,12 +762,12 @@ private static void PatchAbilities()
}
}

type = AccessTools.TypeByName("VFECore.CompShieldField");
type = AccessTools.TypeByName("VEF.CompShieldField");
MpCompat.RegisterLambdaMethod(type, nameof(ThingComp.CompGetWornGizmosExtra), 0);
MpCompat.RegisterLambdaMethod(type, "GetGizmos", 0, 2);

// Time snapshot fix for gizmo itself
type = AccessTools.TypeByName("VFECore.Abilities.Command_Ability");
type = AccessTools.TypeByName("VEF.Abilities.Command_Ability");
foreach (var targetType in type.AllSubclasses().Concat(type))
{
var method = AccessTools.DeclaredMethod(targetType, nameof(Command.GizmoOnGUIInt));
Expand Down Expand Up @@ -2319,4 +2319,4 @@ private static void PatchMovingBases()

#endregion
}
}
}