move framework type to FrameworkBridge

Elektryk-Andrzej · Elektryk-Andrzej · commit 6301474f39f5 · 2026-02-19T18:12:47.000+01:00
diff --git a/Code/Helpers/FrameworkBridge.cs b/Code/Helpers/FrameworkBridge.cs
@@ -9,16 +9,24 @@ namespace SER.Code.Helpers;
 
 public class FrameworkBridge
 {
-    protected record struct Framework(string Name, IDependOnFramework.Type Type);
+    protected record struct Framework(string Name, Type Type);
 
     private readonly List<Framework> _found = [];
     private readonly List<CoroutineHandle> _handles = [];
 
+    public enum Type
+    {
+        None,
+        Exiled,
+        Callvote,
+        Ucr
+    }
+    
     private readonly Framework[] _frameworks =
     [
-        new("Callvote", IDependOnFramework.Type.Callvote),
-        new("Exiled Loader", IDependOnFramework.Type.Exiled),
-        new("UncomplicatedCustomRoles", IDependOnFramework.Type.Ucr)
+        new("Callvote", Type.Callvote),
+        new("Exiled Loader", Type.Exiled),
+        new("UncomplicatedCustomRoles", Type.Ucr)
     ];
 
     public void Load()
@@ -66,7 +74,7 @@ private static bool IsLabAPIComatibleFrameworkLoaded(Framework framework)
     private static bool IsExiledCompatibleFrameworkLoaded(Framework framework)
     {
         // As of right now, Callvote-Exiled is not compatible with SER.
-        if (framework.Type == IDependOnFramework.Type.Callvote) 
+        if (framework.Type == FrameworkBridge.Type.Callvote) 
         {
             return false;
         }
diff --git a/Code/MethodSystem/MethodIndex.cs b/Code/MethodSystem/MethodIndex.cs
@@ -1,6 +1,7 @@
 ﻿using System.Reflection;
 using LabApi.Features.Console;
 using SER.Code.Extensions;
+using SER.Code.Helpers;
 using SER.Code.Helpers.ResultSystem;
 using SER.Code.MethodSystem.BaseMethods;
 using SER.Code.MethodSystem.Structures;
@@ -10,7 +11,7 @@ namespace SER.Code.MethodSystem;
 public static class MethodIndex
 {
     private static readonly Dictionary<string, Method> NameToMethodIndex = [];
-    private static readonly Dictionary<IDependOnFramework.Type, List<Method>> FrameworkDependentMethods = [];
+    private static readonly Dictionary<FrameworkBridge.Type, List<Method>> FrameworkDependentMethods = [];
     
     /// <summary>
     /// Initializes the method index.
@@ -97,7 +98,7 @@ public static TryGet<Method> TryGetMethod(string name)
         return $"There is no method with name '{name}'. Did you mean '{closestMethod ?? "<error>"}'?";
     }
 
-    internal static void LoadMethodsOfFramework(IDependOnFramework.Type framework)
+    internal static void LoadMethodsOfFramework(FrameworkBridge.Type framework)
     {
         foreach (var method in FrameworkDependentMethods.TryGetValue(framework, out var methods) ? methods : [])
         {
diff --git a/Code/MethodSystem/Methods/CASSIEMethods/PlayerCassieMethod.cs b/Code/MethodSystem/Methods/CASSIEMethods/PlayerCassieMethod.cs
@@ -3,6 +3,7 @@
 using JetBrains.Annotations;
 using SER.Code.ArgumentSystem.Arguments;
 using SER.Code.ArgumentSystem.BaseArguments;
+using SER.Code.Helpers;
 using SER.Code.MethodSystem.BaseMethods.Synchronous;
 using SER.Code.MethodSystem.Structures;
 
@@ -11,7 +12,7 @@ namespace SER.Code.MethodSystem.Methods.CASSIEMethods;
 [UsedImplicitly]
 public class PlayerCassieMethod : SynchronousMethod, IDependOnFramework
 {
-    public IDependOnFramework.Type DependsOn => IDependOnFramework.Type.Exiled;
+    public FrameworkBridge.Type DependsOn => FrameworkBridge.Type.Exiled;
     
     public override string Description => "Makes a CASSIE announcement to specified players only.";
 
diff --git a/Code/MethodSystem/Methods/CallvoteMethods/StartVoteAndWaitMethod.cs b/Code/MethodSystem/Methods/CallvoteMethods/StartVoteAndWaitMethod.cs
@@ -7,6 +7,7 @@
 using SER.Code.ArgumentSystem.Arguments;
 using SER.Code.ArgumentSystem.BaseArguments;
 using SER.Code.Extensions;
+using SER.Code.Helpers;
 using SER.Code.MethodSystem.BaseMethods.Yielding;
 using SER.Code.MethodSystem.MethodDescriptors;
 using SER.Code.MethodSystem.Structures;
@@ -63,7 +64,7 @@ namespace SER.Code.MethodSystem.Methods.CallvoteMethods;
 [UsedImplicitly]
 public class StartVoteAndWaitMethod : YieldingReturningMethod<TextValue>, IAdditionalDescription, IDependOnFramework
 {
-    public IDependOnFramework.Type DependsOn => IDependOnFramework.Type.Callvote;
+    public FrameworkBridge.Type DependsOn => FrameworkBridge.Type.Callvote;
     
     public override string Description => "Starts a vote and waits until it is completed.";
     
diff --git a/Code/MethodSystem/Methods/CallvoteMethods/StartVoteMethod.cs b/Code/MethodSystem/Methods/CallvoteMethods/StartVoteMethod.cs
@@ -5,6 +5,7 @@
 using LabApi.Features.Wrappers;
 using SER.Code.ArgumentSystem.Arguments;
 using SER.Code.ArgumentSystem.BaseArguments;
+using SER.Code.Helpers;
 using SER.Code.MethodSystem.BaseMethods.Synchronous;
 using SER.Code.MethodSystem.Structures;
 
@@ -13,7 +14,7 @@ namespace SER.Code.MethodSystem.Methods.CallvoteMethods;
 [UsedImplicitly]
 public class StartVoteMethod : SynchronousMethod, IDependOnFramework
 {
-    public IDependOnFramework.Type DependsOn => IDependOnFramework.Type.Callvote;
+    public FrameworkBridge.Type DependsOn => FrameworkBridge.Type.Callvote;
     
     public override string Description => "Starts a vote.";
 
diff --git a/Code/MethodSystem/Methods/CallvoteMethods/VoteOptionMethod.cs b/Code/MethodSystem/Methods/CallvoteMethods/VoteOptionMethod.cs
@@ -1,6 +1,7 @@
 ﻿using JetBrains.Annotations;
 using SER.Code.ArgumentSystem.Arguments;
 using SER.Code.ArgumentSystem.BaseArguments;
+using SER.Code.Helpers;
 using SER.Code.MethodSystem.BaseMethods.Synchronous;
 using SER.Code.MethodSystem.Structures;
 
@@ -9,7 +10,7 @@ namespace SER.Code.MethodSystem.Methods.CallvoteMethods;
 [UsedImplicitly]
 public class VoteOptionMethod : ReferenceReturningMethod<VoteOptionMethod.VoteOption>, IDependOnFramework
 {
-    public IDependOnFramework.Type DependsOn => IDependOnFramework.Type.Callvote;
+    public FrameworkBridge.Type DependsOn => FrameworkBridge.Type.Callvote;
 
     public record VoteOption(string Option, string DisplayText);
 
diff --git a/Code/MethodSystem/Methods/PlayerMethods/GetAmmoLimitMethod.cs b/Code/MethodSystem/Methods/PlayerMethods/GetAmmoLimitMethod.cs
@@ -3,6 +3,7 @@
 using JetBrains.Annotations;
 using SER.Code.ArgumentSystem.Arguments;
 using SER.Code.ArgumentSystem.BaseArguments;
+using SER.Code.Helpers;
 using SER.Code.MethodSystem.BaseMethods.Synchronous;
 using SER.Code.MethodSystem.Structures;
 using SER.Code.ValueSystem;
@@ -12,7 +13,7 @@ namespace SER.Code.MethodSystem.Methods.PlayerMethods;
 [UsedImplicitly]
 public class GetAmmoLimitMethod : ReturningMethod<NumberValue>, IDependOnFramework
 {
-    public IDependOnFramework.Type DependsOn => IDependOnFramework.Type.Exiled;
+    public FrameworkBridge.Type DependsOn => FrameworkBridge.Type.Exiled;
     
     public override string Description => "Gets the player's limit on a certain ammunition type";
     
diff --git a/Code/MethodSystem/Methods/PlayerMethods/GiveEffectMethod.cs b/Code/MethodSystem/Methods/PlayerMethods/GiveEffectMethod.cs
@@ -3,6 +3,7 @@
 using JetBrains.Annotations;
 using SER.Code.ArgumentSystem.Arguments;
 using SER.Code.ArgumentSystem.BaseArguments;
+using SER.Code.Helpers;
 using SER.Code.MethodSystem.BaseMethods.Synchronous;
 using SER.Code.MethodSystem.Structures;
 
@@ -11,7 +12,7 @@ namespace SER.Code.MethodSystem.Methods.PlayerMethods;
 [UsedImplicitly]
 public class GiveEffectMethod : SynchronousMethod, IDependOnFramework
 {
-    public IDependOnFramework.Type DependsOn => IDependOnFramework.Type.Exiled;
+    public FrameworkBridge.Type DependsOn => FrameworkBridge.Type.Exiled;
     
     public override string Description => "Adds a provided effect to a player.";
 
diff --git a/Code/MethodSystem/Methods/PlayerMethods/SetAmmoLimitMethod.cs b/Code/MethodSystem/Methods/PlayerMethods/SetAmmoLimitMethod.cs
@@ -3,6 +3,7 @@
 using JetBrains.Annotations;
 using SER.Code.ArgumentSystem.Arguments;
 using SER.Code.ArgumentSystem.BaseArguments;
+using SER.Code.Helpers;
 using SER.Code.MethodSystem.BaseMethods.Synchronous;
 using SER.Code.MethodSystem.Structures;
 
@@ -11,7 +12,7 @@ namespace SER.Code.MethodSystem.Methods.PlayerMethods;
 [UsedImplicitly]
 public class SetAmmoLimitMethod : SynchronousMethod, IDependOnFramework
 {
-    public IDependOnFramework.Type DependsOn => IDependOnFramework.Type.Exiled;
+    public FrameworkBridge.Type DependsOn => FrameworkBridge.Type.Exiled;
     
     public override string Description => "Sets the players' limit on a certain ammunition type";
     
diff --git a/Code/MethodSystem/Methods/PlayerMethods/SetAppearanceMethod.cs b/Code/MethodSystem/Methods/PlayerMethods/SetAppearanceMethod.cs
@@ -5,6 +5,7 @@
 using SER.Code.ArgumentSystem.Arguments;
 using SER.Code.ArgumentSystem.BaseArguments;
 using SER.Code.Extensions;
+using SER.Code.Helpers;
 using SER.Code.MethodSystem.BaseMethods.Synchronous;
 using SER.Code.MethodSystem.Structures;
 
@@ -13,7 +14,7 @@ namespace SER.Code.MethodSystem.Methods.PlayerMethods;
 [UsedImplicitly]
 public class SetAppearanceMethod : SynchronousMethod, IDependOnFramework
 {
-    public IDependOnFramework.Type DependsOn => IDependOnFramework.Type.Exiled;
+    public FrameworkBridge.Type DependsOn => FrameworkBridge.Type.Exiled;
     
     public override string Description => "Changes the appearance of a player (or reskins)";
 
diff --git a/Code/MethodSystem/Methods/UCRMethods/GetPlayersWithUCRRoleMethod.cs b/Code/MethodSystem/Methods/UCRMethods/GetPlayersWithUCRRoleMethod.cs
@@ -3,6 +3,7 @@
 using SER.Code.ArgumentSystem.Arguments;
 using SER.Code.ArgumentSystem.BaseArguments;
 using SER.Code.Extensions;
+using SER.Code.Helpers;
 using SER.Code.MethodSystem.BaseMethods.Synchronous;
 using SER.Code.MethodSystem.Structures;
 using SER.Code.ValueSystem;
@@ -14,7 +15,7 @@ namespace SER.Code.MethodSystem.Methods.UCRMethods;
 [UsedImplicitly]
 public class GetPlayersWithUCRRoleMethod : ReturningMethod<PlayerValue>, IDependOnFramework
 {
-    public IDependOnFramework.Type DependsOn => IDependOnFramework.Type.Ucr;
+    public FrameworkBridge.Type DependsOn => FrameworkBridge.Type.Ucr;
 
     public override string Description => "Gets all players who have a provided UCR role.";
 
diff --git a/Code/MethodSystem/Methods/UCRMethods/GetUCRRoleMethod.cs b/Code/MethodSystem/Methods/UCRMethods/GetUCRRoleMethod.cs
@@ -1,6 +1,7 @@
 ﻿using JetBrains.Annotations;
 using SER.Code.ArgumentSystem.Arguments;
 using SER.Code.ArgumentSystem.BaseArguments;
+using SER.Code.Helpers;
 using SER.Code.MethodSystem.BaseMethods.Synchronous;
 using SER.Code.MethodSystem.MethodDescriptors;
 using SER.Code.MethodSystem.Methods.ReferenceVariableMethods;
@@ -16,7 +17,7 @@ public class GetUCRRoleMethod : ReferenceReturningMethod, IAdditionalDescription
 {
     public override Type ReturnType => typeof(ICustomRole);
 
-    public IDependOnFramework.Type DependsOn => IDependOnFramework.Type.Ucr;
+    public FrameworkBridge.Type DependsOn => FrameworkBridge.Type.Ucr;
     
     public override string Description => "Returns a reference to the UCR role a player has.";
 
diff --git a/Code/MethodSystem/Methods/UCRMethods/SetUCRRoleMethod.cs b/Code/MethodSystem/Methods/UCRMethods/SetUCRRoleMethod.cs
@@ -1,6 +1,7 @@
 ﻿using JetBrains.Annotations;
 using SER.Code.ArgumentSystem.Arguments;
 using SER.Code.ArgumentSystem.BaseArguments;
+using SER.Code.Helpers;
 using SER.Code.MethodSystem.BaseMethods.Synchronous;
 using SER.Code.MethodSystem.Structures;
 using UncomplicatedCustomRoles.Extensions;
@@ -11,7 +12,7 @@ namespace SER.Code.MethodSystem.Methods.UCRMethods;
 [UsedImplicitly]
 public class SetUCRRoleMethod : SynchronousMethod, IDependOnFramework
 {
-    public IDependOnFramework.Type DependsOn => IDependOnFramework.Type.Ucr;
+    public FrameworkBridge.Type DependsOn => FrameworkBridge.Type.Ucr;
 
     public override string Description => "Sets the UCR role of a player.";
 
diff --git a/Code/MethodSystem/Methods/UCRMethods/UCRRoleInfoMethod.cs b/Code/MethodSystem/Methods/UCRMethods/UCRRoleInfoMethod.cs
@@ -5,6 +5,7 @@
 using SER.Code.ArgumentSystem.Structures;
 using SER.Code.Exceptions;
 using SER.Code.Extensions;
+using SER.Code.Helpers;
 using SER.Code.MethodSystem.BaseMethods.Synchronous;
 using SER.Code.MethodSystem.MethodDescriptors;
 using SER.Code.MethodSystem.Structures;
@@ -19,7 +20,7 @@ public class UCRRoleInfoMethod : LiteralValueReturningMethod, IReferenceResolvin
 {
     public Type ResolvesReference => typeof(ICustomRole);
 
-    public IDependOnFramework.Type DependsOn => IDependOnFramework.Type.Ucr;
+    public FrameworkBridge.Type DependsOn => FrameworkBridge.Type.Ucr;
 
     public override string Description => "Returns information about a custom role.";
 
diff --git a/Code/MethodSystem/Structures/IDependOnFramework.cs b/Code/MethodSystem/Structures/IDependOnFramework.cs
@@ -1,17 +1,11 @@
-﻿namespace SER.Code.MethodSystem.Structures;
+﻿using SER.Code.Helpers;
+
+namespace SER.Code.MethodSystem.Structures;
 
 /// <summary>
 /// Marks that this method can only load when a given framework is loaded as well
 /// </summary>
 public interface IDependOnFramework
 {
-    public enum Type
-    {
-        None,
-        Exiled,
-        Callvote,
-        Ucr
-    }
-    
-    public Type DependsOn { get; }
+    public FrameworkBridge.Type DependsOn { get; }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`using System.Reflection;`
`2`	`2`	`using LabApi.Features.Console;`
`3`	`3`	`using SER.Code.Extensions;`
	`4`	`+using SER.Code.Helpers;`
`4`	`5`	`using SER.Code.Helpers.ResultSystem;`
`5`	`6`	`using SER.Code.MethodSystem.BaseMethods;`
`6`	`7`	`using SER.Code.MethodSystem.Structures;`
`@@ -10,7 +11,7 @@ namespace SER.Code.MethodSystem;`
`10`	`11`	`public static class MethodIndex`
`11`	`12`	`{`
`12`	`13`	`private static readonly Dictionary<string, Method> NameToMethodIndex = [];`
`13`		`- private static readonly Dictionary<IDependOnFramework.Type, List<Method>> FrameworkDependentMethods = [];`
	`14`	`+ private static readonly Dictionary<FrameworkBridge.Type, List<Method>> FrameworkDependentMethods = [];`
`14`	`15`
`15`	`16`	`/// <summary>`
`16`	`17`	`/// Initializes the method index.`
`@@ -97,7 +98,7 @@ public static TryGet<Method> TryGetMethod(string name)`
`97`	`98`	`return $"There is no method with name '{name}'. Did you mean '{closestMethod ?? "<error>"}'?";`
`98`	`99`	`}`
`99`	`100`
`100`		`- internal static void LoadMethodsOfFramework(IDependOnFramework.Type framework)`
	`101`	`+ internal static void LoadMethodsOfFramework(FrameworkBridge.Type framework)`
`101`	`102`	`{`
`102`	`103`	`foreach (var method in FrameworkDependentMethods.TryGetValue(framework, out var methods) ? methods : [])`
`103`	`104`	`{`