From db23512b4a7021cf5afbfaeecfed7a4ff3085fc0 Mon Sep 17 00:00:00 2001 From: moddedmcplayer <76910334+moddedmcplayer@users.noreply.github.com> Date: Mon, 20 Jan 2025 14:35:23 +0100 Subject: [PATCH 1/6] change refs url --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ffc263b..5c89927 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -11,7 +11,7 @@ concurrency: cancel-in-progress: true env: - EXILED_REFERENCES_URL: https://misaka-zerotwo.github.io/SL-References/Dev.zip + EXILED_REFERENCES_URL: https://exmod-team.github.io/SL-References/Dev.zip EXILED_REFERENCES: ${{ github.workspace }}/refs NWAPIPERMSYSTEM_URL: https://github.com/CedModV2/NWAPIPermissionSystem/releases/latest/download/NWAPIPermissionSystem.dll From 607ce4b659c8a55995385a477f666f1c73dbad54 Mon Sep 17 00:00:00 2001 From: moddedmcplayer <76910334+moddedmcplayer@users.noreply.github.com> Date: Tue, 20 May 2025 23:38:09 +0200 Subject: [PATCH 2/6] uhhhh --- XPSystem.Console/App.config | 2 +- XPSystem.Console/XPSystem.Console.csproj | 40 ++++++++--------- XPSystem.Console/packages.config | 2 +- XPSystem/App.config | 2 +- .../LiteDB/LiteDBPlayerInfo.cs | 17 ++++--- .../BuiltInProviders/LiteDB/LiteDBProvider.cs | 4 +- XPSystem/Main.cs | 21 ++++----- XPSystem/XPSystem.csproj | 44 +++++++++---------- XPSystem/packages.config | 2 +- 9 files changed, 71 insertions(+), 63 deletions(-) diff --git a/XPSystem.Console/App.config b/XPSystem.Console/App.config index 34f6c8d..6ce0cc8 100644 --- a/XPSystem.Console/App.config +++ b/XPSystem.Console/App.config @@ -11,7 +11,7 @@ - + diff --git a/XPSystem.Console/XPSystem.Console.csproj b/XPSystem.Console/XPSystem.Console.csproj index a5c8ebc..cbb9367 100644 --- a/XPSystem.Console/XPSystem.Console.csproj +++ b/XPSystem.Console/XPSystem.Console.csproj @@ -46,41 +46,41 @@ ..\packages\ExMod.Exiled.9.1.1\lib\net48\Assembly-CSharp-Publicized.dll - ..\packages\ExMod.Exiled.9.1.1\lib\net48\CommandSystem.Core.dll + ..\packages\ExMod.Exiled.9.6.0-beta8\lib\net48\CommandSystem.Core.dll - - ..\packages\ExMod.Exiled.9.1.1\lib\net48\Exiled.API.dll + + ..\packages\ExMod.Exiled.9.6.0-beta8\lib\net48\Exiled.API.dll - - ..\packages\ExMod.Exiled.9.1.1\lib\net48\Exiled.CreditTags.dll + + ..\packages\ExMod.Exiled.9.6.0-beta8\lib\net48\Exiled.CreditTags.dll - - ..\packages\ExMod.Exiled.9.1.1\lib\net48\Exiled.CustomItems.dll + + ..\packages\ExMod.Exiled.9.6.0-beta8\lib\net48\Exiled.CustomItems.dll - - ..\packages\ExMod.Exiled.9.1.1\lib\net48\Exiled.CustomRoles.dll + + ..\packages\ExMod.Exiled.9.6.0-beta8\lib\net48\Exiled.CustomRoles.dll - - ..\packages\ExMod.Exiled.9.1.1\lib\net48\Exiled.Events.dll + + ..\packages\ExMod.Exiled.9.6.0-beta8\lib\net48\Exiled.Events.dll - - ..\packages\ExMod.Exiled.9.1.1\lib\net48\Exiled.Loader.dll + + ..\packages\ExMod.Exiled.9.6.0-beta8\lib\net48\Exiled.Loader.dll - - ..\packages\ExMod.Exiled.9.1.1\lib\net48\Exiled.Permissions.dll + + ..\packages\ExMod.Exiled.9.6.0-beta8\lib\net48\Exiled.Permissions.dll - - ..\packages\ExMod.Exiled.9.1.1\lib\net48\NorthwoodLib.dll + + ..\packages\ExMod.Exiled.9.6.0-beta8\lib\net48\LabApi.dll - - ..\packages\ExMod.Exiled.9.1.1\lib\net48\PluginAPI.dll + + ..\packages\ExMod.Exiled.9.6.0-beta8\lib\net48\NorthwoodLib.dll - ..\packages\ExMod.Exiled.9.1.1\lib\net48\YamlDotNet.dll + ..\packages\ExMod.Exiled.9.6.0-beta8\lib\net48\YamlDotNet.dll diff --git a/XPSystem.Console/packages.config b/XPSystem.Console/packages.config index 3a6171a..809deaa 100644 --- a/XPSystem.Console/packages.config +++ b/XPSystem.Console/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/XPSystem/App.config b/XPSystem/App.config index 59da883..9e6f2be 100644 --- a/XPSystem/App.config +++ b/XPSystem/App.config @@ -27,7 +27,7 @@ - + diff --git a/XPSystem/BuiltInProviders/LiteDB/LiteDBPlayerInfo.cs b/XPSystem/BuiltInProviders/LiteDB/LiteDBPlayerInfo.cs index 4f4bb31..a9110ea 100644 --- a/XPSystem/BuiltInProviders/LiteDB/LiteDBPlayerInfo.cs +++ b/XPSystem/BuiltInProviders/LiteDB/LiteDBPlayerInfo.cs @@ -1,5 +1,6 @@ namespace XPSystem.BuiltInProviders.LiteDB { + using System; using global::LiteDB; using XPSystem.API.Enums; using XPSystem.API.StorageProviders.Models; @@ -9,9 +10,12 @@ public class LiteDBNumberPlayerInfo : LiteDBPlayerInfo [BsonId] public ulong Id { get; set; } - public override T SetId(object id) + public override T SetId(IPlayerId id) { - Id = (ulong)id; + if (id is not NumberPlayerId numberPlayerId) + throw new ArgumentException("id is not NumberPlayerId", nameof(id)); + + Id = numberPlayerId.IdNumber; return (T)(object)this; } @@ -23,9 +27,12 @@ public class LiteDBStringPlayerInfo : LiteDBPlayerInfo [BsonId] public string Id { get; set; } - public override T SetId(object id) + public override T SetId(IPlayerId id) { - Id = (string)id; + if (id is not StringPlayerId stringPlayerId) + throw new ArgumentException("id is not StringPlayerId", nameof(id)); + + Id = stringPlayerId.IdString; return (T)(object)this; } @@ -39,7 +46,7 @@ public abstract class LiteDBPlayerInfo public string Nickname { get; set; } #endif - public abstract T SetId(object id) where T : LiteDBPlayerInfo; + public abstract T SetId(IPlayerId id) where T : LiteDBPlayerInfo; protected abstract IPlayerId toPlayerId(AuthType authType); public PlayerInfo ToPlayerInfo(AuthType authType) diff --git a/XPSystem/BuiltInProviders/LiteDB/LiteDBProvider.cs b/XPSystem/BuiltInProviders/LiteDB/LiteDBProvider.cs index 0b9e063..72cdd98 100644 --- a/XPSystem/BuiltInProviders/LiteDB/LiteDBProvider.cs +++ b/XPSystem/BuiltInProviders/LiteDB/LiteDBProvider.cs @@ -102,7 +102,7 @@ protected override PlayerInfo GetPlayerInfoAndCreateOfNotExistNoCache(IPlayerId T info = new T() { XP = 0 - }.SetId(playerId.Id); + }.SetId(playerId); collection.Insert(info); return info.ToPlayerInfo(playerId.AuthType); } @@ -162,7 +162,7 @@ protected override void SetPlayerInfoNoCache(PlayerInfo playerInfo) #if STORENICKS Nickname = playerInfo.Nickname #endif - }.SetId(playerInfo.Player.Id)); + }.SetId(playerInfo.Player)); } else { diff --git a/XPSystem/Main.cs b/XPSystem/Main.cs index 692d541..3212000 100644 --- a/XPSystem/Main.cs +++ b/XPSystem/Main.cs @@ -19,6 +19,8 @@ public class Main #if EXILED : Exiled.API.Features.Plugin +#else + : LabApi.Loader.Features.Plugins.Plugin #endif { public const string VersionString = "2.0.8"; @@ -34,19 +36,20 @@ public class Main /// public static event Action Reloaded = delegate { }; -#if EXILED private static readonly int[] _splitVersion = VersionString .Split('.') .Select(x => Convert.ToInt32(x)) .ToArray(); - + public override Version Version { get; } = new Version(_splitVersion[0], _splitVersion[1], _splitVersion[2]); public override string Author { get; } = "moddedmcplayer, original by BrutoForceMaestro"; public override string Name { get; } = "XPSystem"; - public override Version Version { get; } = new Version(_splitVersion[0], _splitVersion[1], _splitVersion[2]); + +#if EXILED + public override Version RequiredExiledVersion { get; } = new Version(8, 0, 0); #else - [PluginAPI.Core.Attributes.PluginConfig] - public NwAPIConfig Config; + public override string Description { get; } = "A not so basic, customisable leveling system for SCP: SL."; + public override Version RequiredApiVersion { get; } = new Version(1, 0, 0); #endif public static Main Instance { get; private set; } @@ -62,8 +65,8 @@ public class Main #if EXILED public override void OnEnabled() #else - [PluginAPI.Core.Attributes.PluginEntryPoint("xpsystem", VersionString, "xp plugin", "Rowpann's Emperium, original by BrutoForceMaestro")] - public void OnEnabled() + + public override void Enable() #endif { Instance = this; @@ -96,8 +99,7 @@ public void OnEnabled() #if EXILED public override void OnDisabled() #else - [PluginAPI.Core.Attributes.PluginUnload] - public void OnDisabled() + public override void Disable() #endif { PluginEnabled = false; @@ -124,7 +126,6 @@ public void OnDisabled() #if EXILED public override void OnReloaded() #else - [PluginAPI.Core.Attributes.PluginReload] public void OnReloaded() #endif { diff --git a/XPSystem/XPSystem.csproj b/XPSystem/XPSystem.csproj index 3a80ba1..f747679 100644 --- a/XPSystem/XPSystem.csproj +++ b/XPSystem/XPSystem.csproj @@ -86,39 +86,42 @@ ..\packages\Lib.Harmony.2.2.2\lib\net48\0Harmony.dll - ..\packages\ExMod.Exiled.9.1.1\lib\net48\Assembly-CSharp-Publicized.dll + ..\packages\ExMod.Exiled.9.6.0-beta8\lib\net48\Assembly-CSharp-Publicized.dll - ..\packages\ExMod.Exiled.9.1.1\lib\net48\CommandSystem.Core.dll + ..\packages\ExMod.Exiled.9.6.0-beta8\lib\net48\CommandSystem.Core.dll ..\packages\Costura.Fody.5.8.0-alpha0098\lib\netstandard1.0\Costura.dll - - ..\packages\ExMod.Exiled.9.1.1\lib\net48\Exiled.API.dll + + ..\packages\ExMod.Exiled.9.6.0-beta8\lib\net48\Exiled.API.dll - - ..\packages\ExMod.Exiled.9.1.1\lib\net48\Exiled.CreditTags.dll + + ..\packages\ExMod.Exiled.9.6.0-beta8\lib\net48\Exiled.CreditTags.dll - - ..\packages\ExMod.Exiled.9.1.1\lib\net48\Exiled.CustomItems.dll + + ..\packages\ExMod.Exiled.9.6.0-beta8\lib\net48\Exiled.CustomItems.dll - - ..\packages\ExMod.Exiled.9.1.1\lib\net48\Exiled.CustomRoles.dll + + ..\packages\ExMod.Exiled.9.6.0-beta8\lib\net48\Exiled.CustomRoles.dll - - ..\packages\ExMod.Exiled.9.1.1\lib\net48\Exiled.Events.dll + + ..\packages\ExMod.Exiled.9.6.0-beta8\lib\net48\Exiled.Events.dll - - ..\packages\ExMod.Exiled.9.1.1\lib\net48\Exiled.Loader.dll + + ..\packages\ExMod.Exiled.9.6.0-beta8\lib\net48\Exiled.Loader.dll - - ..\packages\ExMod.Exiled.9.1.1\lib\net48\Exiled.Permissions.dll + + ..\packages\ExMod.Exiled.9.6.0-beta8\lib\net48\Exiled.Permissions.dll ..\packages\Flee.1.2.2\lib\net45\Flee.Net45.dll + + ..\packages\ExMod.Exiled.9.6.0-beta8\lib\net48\LabApi.dll + ..\packages\LiteDB.5.0.16\lib\net45\LiteDB.dll @@ -131,15 +134,12 @@ ..\packages\MySqlConnector.2.3.7\lib\net48\MySqlConnector.dll - - ..\packages\ExMod.Exiled.9.1.1\lib\net48\NorthwoodLib.dll + + ..\packages\ExMod.Exiled.9.6.0-beta8\lib\net48\NorthwoodLib.dll ..\refs\NWAPIPermissionSystem.dll - - ..\packages\ExMod.Exiled.9.1.1\lib\net48\PluginAPI.dll - ..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll @@ -176,7 +176,7 @@ - ..\packages\ExMod.Exiled.9.1.1\lib\net48\YamlDotNet.dll + ..\packages\ExMod.Exiled.9.6.0-beta8\lib\net48\YamlDotNet.dll diff --git a/XPSystem/packages.config b/XPSystem/packages.config index 686b6f3..de6c3e4 100644 --- a/XPSystem/packages.config +++ b/XPSystem/packages.config @@ -1,7 +1,7 @@  - + From e15ca222ba223cdb289f4bf7a53430e9d2ce81f0 Mon Sep 17 00:00:00 2001 From: m <76910334+moddedmcplayer@users.noreply.github.com> Date: Sat, 24 May 2025 00:32:34 +0200 Subject: [PATCH 3/6] . --- .github/workflows/main.yml | 8 +----- XPSystem/API/LoaderSpecific.cs | 25 ++++++++++--------- XPSystem/API/XPPlayer.cs | 2 +- XPSystem/Config/ConfigShared.cs | 2 +- .../LoaderSpecific/NWAPIEventHandlers.cs | 8 +++--- XPSystem/XPSystem.csproj | 3 --- 6 files changed, 20 insertions(+), 28 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ffc263b..131a420 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -11,9 +11,8 @@ concurrency: cancel-in-progress: true env: - EXILED_REFERENCES_URL: https://misaka-zerotwo.github.io/SL-References/Dev.zip + EXILED_REFERENCES_URL: https://exslmod-team.github.io/SL-References/Dev.zip EXILED_REFERENCES: ${{ github.workspace }}/refs - NWAPIPERMSYSTEM_URL: https://github.com/CedModV2/NWAPIPermissionSystem/releases/latest/download/NWAPIPermissionSystem.dll jobs: main: @@ -41,11 +40,6 @@ jobs: Invoke-WebRequest -Uri ${{ env.EXILED_REFERENCES_URL }} -OutFile ${{ github.workspace }}/References.zip Expand-Archive -Path References.zip -DestinationPath ${{ env.EXILED_REFERENCES }} -Force - - name: Get nwapipermissionsystem - shell: pwsh - run: | - Invoke-WebRequest -Uri ${{ env.NWAPIPERMSYSTEM_URL }} -OutFile ${{ env.EXILED_REFERENCES }}/NWAPIPermissionSystem.dll - - name: Restore Packages run: nuget restore ${{ github.workspace }}/XPSystem.sln diff --git a/XPSystem/API/LoaderSpecific.cs b/XPSystem/API/LoaderSpecific.cs index 280303b..b713375 100644 --- a/XPSystem/API/LoaderSpecific.cs +++ b/XPSystem/API/LoaderSpecific.cs @@ -25,7 +25,7 @@ public static class LoaderSpecific #if EXILED Exiled.API.Features.Paths.Configs; #else - PluginAPI.Helpers.Paths.LocalPlugins.Plugins; + LabApi.Loader.Features.Paths.PathManager.LocalPlugins.Plugins; #endif /// @@ -41,17 +41,17 @@ public static ReferenceHub GetHub(string data) return Exiled.API.Features.Player.Get(data)?.ReferenceHub; #else if (uint.TryParse(data, out uint networkId) - && PluginAPI.Core.Player.TryGet(networkId, out var player)) + && LabApi.Features.Wrappers.Player.TryGet(networkId, out var player)) return player.ReferenceHub; if (int.TryParse(data, out int playerId) - && PluginAPI.Core.Player.TryGet(playerId, out player)) + && LabApi.Features.Wrappers.Player.TryGet(playerId, out player)) return player.ReferenceHub; - if (PluginAPI.Core.Player.TryGet(data, out player)) + if (LabApi.Features.Wrappers.Player.TryGet(data, out player)) return player.ReferenceHub; - return PluginAPI.Core.Player.GetByName(data)?.ReferenceHub; + return LabApi.Features.Wrappers.Player.TryGetPlayersByName(data)?.ReferenceHub; #endif } @@ -99,7 +99,7 @@ public static bool CheckPermission(ICommandSender sender, string permission) #if EXILED return Exiled.Permissions.Extensions.Permissions.CheckPermission(sender, permission); #else - return NWAPIPermissionSystem.PermissionHandler.CheckPermission(sender, permission); + return LabApi.Features.Permissions.PermissionsExtensions.HasPermissions(sender, permission); #endif } @@ -117,8 +117,8 @@ public static bool CheckPermission(ReferenceHub hub, string permission) Exiled.API.Features.Player.Get(hub) , permission); #else - return NWAPIPermissionSystem.PermissionHandler - .CheckPermission(hub.authManager.UserId, permission); + return LabApi.Features.Permissions.PermissionsManager + .HasPermissions(Player.Get(hub), permission); #endif } @@ -140,7 +140,7 @@ public static void LogDebug(string message) Exiled.API.Features.Log.Debug(message); #else if (XPAPI.Config.Debug) - PluginAPI.Core.Log.Debug(message); + LabApi.Core.Log.Debug(message); #endif } @@ -149,7 +149,8 @@ public static void LogInfo(string message) #if EXILED Exiled.API.Features.Log.Info(message); #else - PluginAPI.Core.Log.Info(message); + LabApi. + .Log.Info(message); #endif } @@ -158,7 +159,7 @@ public static void LogWarn(string message) #if EXILED Exiled.API.Features.Log.Warn(message); #else - PluginAPI.Core.Log.Warning(message); + LabApi.Core.Log.Warning(message); #endif } @@ -167,7 +168,7 @@ public static void LogError(string message) #if EXILED Exiled.API.Features.Log.Error(message); #else - PluginAPI.Core.Log.Error(message); + LabApi.Core.Log.Error(message); #endif } diff --git a/XPSystem/API/XPPlayer.cs b/XPSystem/API/XPPlayer.cs index 6dc2ac9..4c07a4d 100644 --- a/XPSystem/API/XPPlayer.cs +++ b/XPSystem/API/XPPlayer.cs @@ -532,7 +532,7 @@ private static void MakeCustomSyncWriter(NetworkIdentity behaviorOwner, Type tar /// public static implicit operator XPPlayer(Exiled.API.Features.Player player) => Get(player.ReferenceHub); #else - public static implicit operator XPPlayer(PluginAPI.Core.Player player) => Get(player.ReferenceHub); + public static implicit operator XPPlayer(LabApi.Core.Player player) => Get(player.ReferenceHub); #endif } } \ No newline at end of file diff --git a/XPSystem/Config/ConfigShared.cs b/XPSystem/Config/ConfigShared.cs index 3232670..0781ffe 100644 --- a/XPSystem/Config/ConfigShared.cs +++ b/XPSystem/Config/ConfigShared.cs @@ -19,7 +19,7 @@ public abstract class ConfigShared : Config #if EXILED Exiled.API.Features.Paths.Configs, #else - Path.Combine(PluginAPI.Helpers.Paths.LocalPlugins.Plugins, "XPSystem"), + Path.Combine(LabApi.Helpers.Paths.LocalPlugins.Plugins, "XPSystem"), #endif "Players.db"); } diff --git a/XPSystem/EventHandlers/LoaderSpecific/NWAPIEventHandlers.cs b/XPSystem/EventHandlers/LoaderSpecific/NWAPIEventHandlers.cs index 7cbac58..873bce8 100644 --- a/XPSystem/EventHandlers/LoaderSpecific/NWAPIEventHandlers.cs +++ b/XPSystem/EventHandlers/LoaderSpecific/NWAPIEventHandlers.cs @@ -6,10 +6,10 @@ using PlayerRoles; using PlayerRoles.Ragdolls; using PlayerStatsSystem; - using PluginAPI.Core; - using PluginAPI.Core.Attributes; - using PluginAPI.Enums; - using PluginAPI.Events; + using LabApi.Core; + using LabApi.Core.Attributes; + using LabApi.Enums; + using LabApi.Events; using XPSystem.API; #if !EXILED diff --git a/XPSystem/XPSystem.csproj b/XPSystem/XPSystem.csproj index f747679..a2492df 100644 --- a/XPSystem/XPSystem.csproj +++ b/XPSystem/XPSystem.csproj @@ -137,9 +137,6 @@ ..\packages\ExMod.Exiled.9.6.0-beta8\lib\net48\NorthwoodLib.dll - - ..\refs\NWAPIPermissionSystem.dll - ..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll From c6c74a05f3b146b495baf22bb6f4c132e7d8fdea Mon Sep 17 00:00:00 2001 From: moddedmcplayer <76910334+moddedmcplayer@users.noreply.github.com> Date: Sat, 24 May 2025 19:27:12 +0200 Subject: [PATCH 4/6] final stuff --- README.md | 5 +- .../SyncVarXPDisplayProvider.cs | 8 +- .../API/DisplayProviders/XPDisplayProvider.cs | 2 + XPSystem/API/LoaderSpecific.cs | 19 +-- XPSystem/API/XPPlayer.cs | 2 +- XPSystem/App.config | 4 + .../Patch/MyNickPatchXPDisplayProvider.cs | 2 +- .../Patch/NickPatchXPDisplayProvider.cs | 5 +- .../Display/SyncVar/NickXPDisplayProvider.cs | 3 + .../Display/SyncVar/RankXPDisplayProvider.cs | 2 + XPSystem/Config/ConfigShared.cs | 2 +- .../LoaderSpecific/NWAPIEventHandlers.cs | 120 ++++++++++-------- .../EventHandlers/UnifiedEventHandlers.cs | 2 +- XPSystem/Main.cs | 14 +- XPSystem/XPSystem.csproj | 26 ++-- XPSystem/packages.config | 2 +- 16 files changed, 127 insertions(+), 91 deletions(-) diff --git a/README.md b/README.md index e9913f5..f666634 100644 --- a/README.md +++ b/README.md @@ -12,8 +12,9 @@ You can always request more features by messaging me on discord: `moddedmcplayer # Installation Drag and drop plugin into the plugins folder.
Use -nw-bundled instead of -nw if you are getting an error regarding missing 0Harmony. -### NWAPI version also requires -- https://github.com/CedModV2/NWAPIPermissionSystem/releases/latest +### ~~NWAPI version also requires~~ +- ~~https://github.com/CedModV2/NWAPIPermissionSystem/releases/latest~~ +- Uses LapAPI perms now, nw version still missing: generator, throw, and door events ## READ: If you have previously (before version 2.0) used the plugin and your data is gone, Run `xps migrate` in the server console to migrate the old database. diff --git a/XPSystem/API/DisplayProviders/SyncVarXPDisplayProvider.cs b/XPSystem/API/DisplayProviders/SyncVarXPDisplayProvider.cs index e0ddeaf..3d8100b 100644 --- a/XPSystem/API/DisplayProviders/SyncVarXPDisplayProvider.cs +++ b/XPSystem/API/DisplayProviders/SyncVarXPDisplayProvider.cs @@ -35,9 +35,10 @@ protected override void RefreshToEnabled(XPPlayer player) foreach (var kvp in XPPlayer.Players) { + if (kvp.Value.IsNPC) + continue; if (player == kvp.Value) continue; - if (!ShouldEdit(kvp.Value)) continue; @@ -61,9 +62,10 @@ protected override void RefreshToDisabled(XPPlayer player) foreach (var kvp in XPPlayer.Players) { + if (kvp.Value.IsNPC) + continue; if (player == kvp.Value) continue; - if (!ShouldEdit(kvp.Value)) continue; @@ -138,6 +140,6 @@ protected virtual TObject GetObject(XPPlayer player, PlayerInfoWrapper playerInf /// The player to show the data of. /// The target player to show the data to. /// Whether or not the player's data should be shown to the target player. - protected virtual bool ShouldShowTo(XPPlayer player, XPPlayer target) => true; + protected virtual bool ShouldShowTo(XPPlayer player, XPPlayer target) => !target.IsNPC; } } \ No newline at end of file diff --git a/XPSystem/API/DisplayProviders/XPDisplayProvider.cs b/XPSystem/API/DisplayProviders/XPDisplayProvider.cs index 9d87007..92be478 100644 --- a/XPSystem/API/DisplayProviders/XPDisplayProvider.cs +++ b/XPSystem/API/DisplayProviders/XPDisplayProvider.cs @@ -62,6 +62,8 @@ public virtual void RefreshTo(XPPlayer player) { if (!Config.Enabled && !HasSet) return; + if (player.IsNPC) + return; if (Config.Enabled) { diff --git a/XPSystem/API/LoaderSpecific.cs b/XPSystem/API/LoaderSpecific.cs index b713375..952f945 100644 --- a/XPSystem/API/LoaderSpecific.cs +++ b/XPSystem/API/LoaderSpecific.cs @@ -25,7 +25,7 @@ public static class LoaderSpecific #if EXILED Exiled.API.Features.Paths.Configs; #else - LabApi.Loader.Features.Paths.PathManager.LocalPlugins.Plugins; + LabApi.Loader.Features.Paths.PathManager.Configs.FullName; #endif /// @@ -51,7 +51,8 @@ public static ReferenceHub GetHub(string data) if (LabApi.Features.Wrappers.Player.TryGet(data, out player)) return player.ReferenceHub; - return LabApi.Features.Wrappers.Player.TryGetPlayersByName(data)?.ReferenceHub; + LabApi.Features.Wrappers.Player.TryGetPlayersByName(data, out var list); + return list.FirstOrDefault()?.ReferenceHub; #endif } @@ -118,7 +119,7 @@ public static bool CheckPermission(ReferenceHub hub, string permission) , permission); #else return LabApi.Features.Permissions.PermissionsManager - .HasPermissions(Player.Get(hub), permission); + .HasPermissions(LabApi.Features.Wrappers.Player.Get(hub), permission); #endif } @@ -131,7 +132,8 @@ public static bool CheckNPC(ReferenceHub hub) => #if EXILED Exiled.API.Features.Player.Get(hub)?.IsNPC == true; #else - false; + // ReSharper disable once ConstantConditionalAccessQualifier + LabApi.Features.Wrappers.Player.Get(hub)?.IsNpc == true; #endif public static void LogDebug(string message) @@ -140,7 +142,7 @@ public static void LogDebug(string message) Exiled.API.Features.Log.Debug(message); #else if (XPAPI.Config.Debug) - LabApi.Core.Log.Debug(message); + LabApi.Features.Console.Logger.Debug(message); #endif } @@ -149,8 +151,7 @@ public static void LogInfo(string message) #if EXILED Exiled.API.Features.Log.Info(message); #else - LabApi. - .Log.Info(message); + LabApi.Features.Console.Logger.Info(message); #endif } @@ -159,7 +160,7 @@ public static void LogWarn(string message) #if EXILED Exiled.API.Features.Log.Warn(message); #else - LabApi.Core.Log.Warning(message); + LabApi.Features.Console.Logger.Warn(message); #endif } @@ -168,7 +169,7 @@ public static void LogError(string message) #if EXILED Exiled.API.Features.Log.Error(message); #else - LabApi.Core.Log.Error(message); + LabApi.Features.Console.Logger.Error(message); #endif } diff --git a/XPSystem/API/XPPlayer.cs b/XPSystem/API/XPPlayer.cs index 4c07a4d..7acf339 100644 --- a/XPSystem/API/XPPlayer.cs +++ b/XPSystem/API/XPPlayer.cs @@ -532,7 +532,7 @@ private static void MakeCustomSyncWriter(NetworkIdentity behaviorOwner, Type tar /// public static implicit operator XPPlayer(Exiled.API.Features.Player player) => Get(player.ReferenceHub); #else - public static implicit operator XPPlayer(LabApi.Core.Player player) => Get(player.ReferenceHub); + public static implicit operator XPPlayer(LabApi.Features.Wrappers.Player player) => Get(player.ReferenceHub); #endif } } \ No newline at end of file diff --git a/XPSystem/App.config b/XPSystem/App.config index 9e6f2be..58c7af8 100644 --- a/XPSystem/App.config +++ b/XPSystem/App.config @@ -29,6 +29,10 @@ + + + + \ No newline at end of file diff --git a/XPSystem/BuiltInProviders/Display/Patch/MyNickPatchXPDisplayProvider.cs b/XPSystem/BuiltInProviders/Display/Patch/MyNickPatchXPDisplayProvider.cs index ab42f79..068aec5 100644 --- a/XPSystem/BuiltInProviders/Display/Patch/MyNickPatchXPDisplayProvider.cs +++ b/XPSystem/BuiltInProviders/Display/Patch/MyNickPatchXPDisplayProvider.cs @@ -14,7 +14,7 @@ internal static class NicknamePatch { public static void Prefix(NicknameSync __instance, ref string value) { - if (__instance._hub.IsHost) + if (!__instance._hub || __instance._hub.IsHost || __instance._hub.IsDummy) return; foreach (IXPDisplayProvider provider in XPAPI.DisplayProviders) diff --git a/XPSystem/BuiltInProviders/Display/Patch/NickPatchXPDisplayProvider.cs b/XPSystem/BuiltInProviders/Display/Patch/NickPatchXPDisplayProvider.cs index 9544cb6..e929a98 100644 --- a/XPSystem/BuiltInProviders/Display/Patch/NickPatchXPDisplayProvider.cs +++ b/XPSystem/BuiltInProviders/Display/Patch/NickPatchXPDisplayProvider.cs @@ -8,7 +8,7 @@ public class NickPatchXPDisplayProvider : XPDisplayProvider { - public Dictionary DisplayNameOverrides { get; } = new Dictionary(); + public Dictionary DisplayNameOverrides { get; } = new(); protected override void RefreshOfEnabled(XPPlayer player, PlayerInfoWrapper playerInfo) => Refresh(player); protected override void RefreshOfDisabled(XPPlayer player) => Refresh(player); @@ -25,6 +25,9 @@ internal static class DisplayNamePatch { public static void Prefix(NicknameSync __instance, ref string value) { + if (!__instance._hub || __instance._hub.IsHost || __instance._hub.IsDummy) + return; + foreach (IXPDisplayProvider provider in XPAPI.DisplayProviders) { if (provider is NickPatchXPDisplayProvider nickProvider) diff --git a/XPSystem/BuiltInProviders/Display/SyncVar/NickXPDisplayProvider.cs b/XPSystem/BuiltInProviders/Display/SyncVar/NickXPDisplayProvider.cs index 465d1d6..cbd7977 100644 --- a/XPSystem/BuiltInProviders/Display/SyncVar/NickXPDisplayProvider.cs +++ b/XPSystem/BuiltInProviders/Display/SyncVar/NickXPDisplayProvider.cs @@ -29,6 +29,9 @@ internal static class NickCommandPatch { public static void Postfix(NicknameSync __instance) { + if (__instance._hub.IsDummy) + return; + foreach (IXPDisplayProvider provider in XPAPI.DisplayProviders) { if (provider is NickXPDisplayProvider nickProvider && nickProvider.Config.PatchNickCommand) diff --git a/XPSystem/BuiltInProviders/Display/SyncVar/RankXPDisplayProvider.cs b/XPSystem/BuiltInProviders/Display/SyncVar/RankXPDisplayProvider.cs index b0ff757..d856383 100644 --- a/XPSystem/BuiltInProviders/Display/SyncVar/RankXPDisplayProvider.cs +++ b/XPSystem/BuiltInProviders/Display/SyncVar/RankXPDisplayProvider.cs @@ -76,6 +76,8 @@ protected override bool ShouldEdit(XPPlayer player) protected override bool ShouldShowTo(XPPlayer player, XPPlayer target) { + if (!base.ShouldShowTo(player, target)) + return false; if (!Config.EditBadgeHiding) return true; diff --git a/XPSystem/Config/ConfigShared.cs b/XPSystem/Config/ConfigShared.cs index 0781ffe..cd5b6b4 100644 --- a/XPSystem/Config/ConfigShared.cs +++ b/XPSystem/Config/ConfigShared.cs @@ -19,7 +19,7 @@ public abstract class ConfigShared : Config #if EXILED Exiled.API.Features.Paths.Configs, #else - Path.Combine(LabApi.Helpers.Paths.LocalPlugins.Plugins, "XPSystem"), + Path.Combine(LabApi.Loader.Features.Paths.PathManager.Plugins.FullName, "XPSystem"), #endif "Players.db"); } diff --git a/XPSystem/EventHandlers/LoaderSpecific/NWAPIEventHandlers.cs b/XPSystem/EventHandlers/LoaderSpecific/NWAPIEventHandlers.cs index 873bce8..d17c71d 100644 --- a/XPSystem/EventHandlers/LoaderSpecific/NWAPIEventHandlers.cs +++ b/XPSystem/EventHandlers/LoaderSpecific/NWAPIEventHandlers.cs @@ -1,84 +1,100 @@ namespace XPSystem.EventHandlers.LoaderSpecific { - using InventorySystem.Items; - using InventorySystem.Items.Pickups; - using MEC; - using PlayerRoles; - using PlayerRoles.Ragdolls; - using PlayerStatsSystem; - using LabApi.Core; - using LabApi.Core.Attributes; - using LabApi.Enums; - using LabApi.Events; + using LabApi.Events.Arguments.PlayerEvents; + using LabApi.Events.Arguments.Scp049Events; + using LabApi.Events.Arguments.Scp914Events; + using LabApi.Events.Arguments.ServerEvents; using XPSystem.API; #if !EXILED public class NWAPIEventHandlers : UnifiedEventHandlers { - public override void RegisterEvents(Main plugin) => - EventManager.RegisterEvents(plugin, this); - - public override void UnregisterEvents(Main plugin) => - EventManager.UnregisterEvents(plugin, this); - - [PluginEvent(ServerEventType.PlayerJoined)] // playerid null immediately after joining - private void PlayerJoined(Player player) => Timing.CallDelayed(.5f, () => OnPlayerJoined(player)); - - [PluginEvent(ServerEventType.PlayerLeft)] - private void PlayerLeaving(Player player) => OnPlayerLeft(player); + public override void RegisterEvents(Main plugin) + { + LabApi.Events.Handlers.PlayerEvents.Joined += PlayerJoined; + LabApi.Events.Handlers.PlayerEvents.Left += PlayerLeaving; + LabApi.Events.Handlers.PlayerEvents.ChangedRole += PlayedChangedRole; + LabApi.Events.Handlers.ServerEvents.RoundEnded += RoundEnded; + LabApi.Events.Handlers.ServerEvents.RoundRestarted += RoundRestarting; + + LabApi.Events.Handlers.PlayerEvents.Dying += PlayerDied; + LabApi.Events.Handlers.Scp914Events.ProcessedPickup += PlayerUpgradedPickup; + LabApi.Events.Handlers.Scp914Events.ProcessedInventoryItem += PlayerUpgradedItem; + LabApi.Events.Handlers.PlayerEvents.PickedUpItem += PlayerPickedUpItem; + LabApi.Events.Handlers.PlayerEvents.DroppedItem += PlayerDroppedItem; + LabApi.Events.Handlers.PlayerEvents.UsedItem += PlayerUsedItem; + LabApi.Events.Handlers.PlayerEvents.Spawned += PlayerSpawned; + LabApi.Events.Handlers.PlayerEvents.Escaped += PlayerEscaping; + + LabApi.Events.Handlers.Scp049Events.ResurrectedBody += Scp049FinishingRecall; + } - [PluginEvent(ServerEventType.PlayerChangeRole)] - private void PlayedChangedRole(Player plr, PlayerRoleBase oldRole, RoleTypeId newRole, RoleChangeReason reason) => - OnPlayerChangedRole(plr, oldRole.RoleTypeId, newRole); + public override void UnregisterEvents(Main plugin) + { + LabApi.Events.Handlers.PlayerEvents.Joined -= PlayerJoined; + LabApi.Events.Handlers.PlayerEvents.Left -= PlayerLeaving; + LabApi.Events.Handlers.PlayerEvents.ChangedRole -= PlayedChangedRole; + LabApi.Events.Handlers.ServerEvents.RoundEnded -= RoundEnded; + LabApi.Events.Handlers.ServerEvents.RoundRestarted -= RoundRestarting; + + LabApi.Events.Handlers.PlayerEvents.Dying -= PlayerDied; + LabApi.Events.Handlers.Scp914Events.ProcessedPickup -= PlayerUpgradedPickup; + LabApi.Events.Handlers.Scp914Events.ProcessedInventoryItem -= PlayerUpgradedItem; + LabApi.Events.Handlers.PlayerEvents.PickedUpItem -= PlayerPickedUpItem; + LabApi.Events.Handlers.PlayerEvents.DroppedItem -= PlayerDroppedItem; + LabApi.Events.Handlers.PlayerEvents.UsedItem -= PlayerUsedItem; + LabApi.Events.Handlers.PlayerEvents.Spawned -= PlayerSpawned; + LabApi.Events.Handlers.PlayerEvents.Escaped -= PlayerEscaping; + + LabApi.Events.Handlers.Scp049Events.ResurrectedBody -= Scp049FinishingRecall; + } - [PluginEvent(ServerEventType.RoundEnd)] - private void RoundEnded(RoundSummary.LeadingTeam leadingTeam) => OnRoundEnded(leadingTeam); + private void PlayerJoined(PlayerJoinedEventArgs ev) => OnPlayerJoined(ev.Player); + private void PlayerLeaving(PlayerLeftEventArgs ev) => OnPlayerLeft(ev.Player); + private void PlayedChangedRole(PlayerChangedRoleEventArgs ev) => OnPlayerChangedRole(ev.Player, ev.Player.Role, ev.NewRole.RoleTypeId); - [PluginEvent(ServerEventType.RoundRestart)] + protected void RoundEnded(RoundEndedEventArgs ev) => OnRoundEnded(ev.LeadingTeam); private void RoundRestarting() => OnRoundRestarting(); - [PluginEvent(ServerEventType.PlayerDying)] - private void PlayerDied(Player player, Player attacker, DamageHandlerBase damageHandler) + private void PlayerDied(PlayerDyingEventArgs ev) { - if (IsNull(player) || IsNull(attacker)) + if (!ev.IsAllowed) + return; + if (IsNull(ev.Player) || IsNull(ev.Attacker)) return; - OnPlayedDied(attacker, player); + OnPlayedDied(ev.Attacker, ev.Player, ev.Player.Role); } - [PluginEvent(ServerEventType.Scp914PickupUpgraded)] - private void PlayerUpgradedItem(Scp914PickupUpgradedEvent ev) + private void PlayerUpgradedPickup(Scp914ProcessedPickupEventArgs ev) { - if (IsNull(ev.Item.PreviousOwner.Hub)) + if (IsNull(ev.Pickup?.LastOwner)) return; - OnPlayerUpgradedItem(ev.Item.PreviousOwner.Hub, ev.Item.Info.ItemId.GetCategory()); + OnPlayerUpgradedItem(ev.Pickup!.LastOwner, ev.Pickup.Type.GetCategory()); } - [PluginEvent(ServerEventType.PlayerSearchedPickup)] - private void PlayerPickedUpItem(Player player, ItemPickupBase item) => OnPlayerPickedUpItem(player, item.Info.ItemId.GetCategory()); - -#warning - Move it over to DroppedItem when possible - [PluginEvent(ServerEventType.PlayerDropItem)] - private void OnPlayerDroppedItem(Player player, ItemBase item) => OnPlayerDroppedItem(player, item.Category); - - [PluginEvent(ServerEventType.PlayerUsedItem)] - private void OnPlayerUsedItem(Player player, ItemBase item) => OnPlayerUsedItem(player, item.ItemTypeId); + private void PlayerUpgradedItem(Scp914ProcessedInventoryItemEventArgs ev) => OnPlayerUpgradedItem(ev.Player, ev.Item.Category); + private void PlayerPickedUpItem(PlayerPickedUpItemEventArgs ev) => OnPlayerPickedUpItem(ev.Player, ev.Item.Category); - [PluginEvent(ServerEventType.PlayerSpawn)] - private void OnSpawn(Player player, RoleTypeId role) + private void PlayerDroppedItem(PlayerDroppedItemEventArgs ev) { - if (string.IsNullOrWhiteSpace(player.UserId)) + if (IsNull(ev.Player) || IsNull(ev.Pickup)) return; - OnPlayerSpawned(player); + OnPlayerDroppedItem(ev.Player, ev.Pickup.Type.GetCategory()); } - [PluginEvent(ServerEventType.PlayerEscape)] - private void OnPlayerEscaped(Player player, RoleTypeId role) => OnPlayerEscaped(player); + private void PlayerUsedItem(PlayerUsedItemEventArgs ev) => OnPlayerUsedItem(ev.Player, ev.UsableItem.Type); + private void PlayerSpawned(PlayerSpawnedEventArgs ev) + { + if (!ev.Player.IsReady) + return; + OnPlayerSpawned(ev.Player); + } - [PluginEvent(ServerEventType.Scp049ResurrectBody)] - public void OnScp049ResurrectBody(Player player, Player target, BasicRagdoll body) => OnPlayerResurrected(player); + private void PlayerEscaping(PlayerEscapedEventArgs ev) => OnPlayerEscaped(ev.Player); + private void Scp049FinishingRecall(Scp049ResurrectedBodyEventArgs ev) => OnPlayerResurrected(ev.Player); } #endif } \ No newline at end of file diff --git a/XPSystem/EventHandlers/UnifiedEventHandlers.cs b/XPSystem/EventHandlers/UnifiedEventHandlers.cs index 8d23b43..aea530d 100644 --- a/XPSystem/EventHandlers/UnifiedEventHandlers.cs +++ b/XPSystem/EventHandlers/UnifiedEventHandlers.cs @@ -50,7 +50,7 @@ protected bool IsNull(T obj) // Event needs to exist to ensure players are added to list protected void OnPlayerJoined(XPPlayer player) { - if (XPAPI.StorageProvider != null) + if (XPAPI.StorageProvider != null && !player.IsNPC) { if (player.DNT) { diff --git a/XPSystem/Main.cs b/XPSystem/Main.cs index 3212000..2a4037d 100644 --- a/XPSystem/Main.cs +++ b/XPSystem/Main.cs @@ -4,10 +4,12 @@ using System.Collections.Generic; using System.IO; using System.Linq; + using Exiled.Loader.Models; using HarmonyLib; using XPSystem.API; using XPSystem.API.Legacy; using XPSystem.API.StorageProviders; + using XPSystem.BuiltInProviders.Display.Patch; using XPSystem.Commands.Client; using XPSystem.Config; using XPSystem.Config.Events; @@ -46,16 +48,16 @@ public class Main #if EXILED - public override Version RequiredExiledVersion { get; } = new Version(8, 0, 0); + public override Version RequiredExiledVersion { get; } = Exiled.Loader.Loader.Version; #else public override string Description { get; } = "A not so basic, customisable leveling system for SCP: SL."; - public override Version RequiredApiVersion { get; } = new Version(1, 0, 0); + public override Version RequiredApiVersion { get; } = LabApi.Features.LabApiProperties.CurrentVersion; #endif public static Main Instance { get; private set; } public Harmony Harmony { get; private set; } - private UnifiedEventHandlers _eventHandlers = new + private readonly UnifiedEventHandlers _eventHandlers = new #if EXILED ExiledEventHandlers(); #else @@ -74,9 +76,9 @@ public override void Enable() Harmony = new Harmony($"XPSystem - {DateTime.Now.Ticks}"); Harmony.PatchAll(); - DisplayProviders.Add(new NickXPDisplayProvider()); + DisplayProviders.Add(new NickPatchXPDisplayProvider()); DisplayProviders.Add(new RankXPDisplayProvider()); - MessagingProvider = MessagingProviders.Get(Config.DisplayMode); + MessagingProvider = MessagingProviders.Get(Config.DisplayMode); // why nullable XPECLimitTracker.Initialize(); LoadExtraConfigs(); @@ -150,7 +152,7 @@ public void LoadExtraConfigs() { try { - Directory.CreateDirectory(Config.ExtendedConfigPath); + Directory.CreateDirectory(Config!.ExtendedConfigPath); SetStorageProvider(Config.StorageProvider); SetDisplayProviders(Config.AdditionalDisplayProviders); diff --git a/XPSystem/XPSystem.csproj b/XPSystem/XPSystem.csproj index a2492df..13b0402 100644 --- a/XPSystem/XPSystem.csproj +++ b/XPSystem/XPSystem.csproj @@ -86,41 +86,41 @@ ..\packages\Lib.Harmony.2.2.2\lib\net48\0Harmony.dll - ..\packages\ExMod.Exiled.9.6.0-beta8\lib\net48\Assembly-CSharp-Publicized.dll + ..\packages\ExMod.Exiled.9.6.0\lib\net48\Assembly-CSharp-Publicized.dll - ..\packages\ExMod.Exiled.9.6.0-beta8\lib\net48\CommandSystem.Core.dll + ..\packages\ExMod.Exiled.9.6.0\lib\net48\CommandSystem.Core.dll ..\packages\Costura.Fody.5.8.0-alpha0098\lib\netstandard1.0\Costura.dll - ..\packages\ExMod.Exiled.9.6.0-beta8\lib\net48\Exiled.API.dll + ..\packages\ExMod.Exiled.9.6.0\lib\net48\Exiled.API.dll - ..\packages\ExMod.Exiled.9.6.0-beta8\lib\net48\Exiled.CreditTags.dll + ..\packages\ExMod.Exiled.9.6.0\lib\net48\Exiled.CreditTags.dll - ..\packages\ExMod.Exiled.9.6.0-beta8\lib\net48\Exiled.CustomItems.dll + ..\packages\ExMod.Exiled.9.6.0\lib\net48\Exiled.CustomItems.dll - ..\packages\ExMod.Exiled.9.6.0-beta8\lib\net48\Exiled.CustomRoles.dll + ..\packages\ExMod.Exiled.9.6.0\lib\net48\Exiled.CustomRoles.dll - ..\packages\ExMod.Exiled.9.6.0-beta8\lib\net48\Exiled.Events.dll + ..\packages\ExMod.Exiled.9.6.0\lib\net48\Exiled.Events.dll - ..\packages\ExMod.Exiled.9.6.0-beta8\lib\net48\Exiled.Loader.dll + ..\packages\ExMod.Exiled.9.6.0\lib\net48\Exiled.Loader.dll - ..\packages\ExMod.Exiled.9.6.0-beta8\lib\net48\Exiled.Permissions.dll + ..\packages\ExMod.Exiled.9.6.0\lib\net48\Exiled.Permissions.dll ..\packages\Flee.1.2.2\lib\net45\Flee.Net45.dll - - ..\packages\ExMod.Exiled.9.6.0-beta8\lib\net48\LabApi.dll + + ..\packages\ExMod.Exiled.9.6.0\lib\net48\LabApi.dll ..\packages\LiteDB.5.0.16\lib\net45\LiteDB.dll @@ -135,7 +135,7 @@ ..\packages\MySqlConnector.2.3.7\lib\net48\MySqlConnector.dll - ..\packages\ExMod.Exiled.9.6.0-beta8\lib\net48\NorthwoodLib.dll + ..\packages\ExMod.Exiled.9.6.0\lib\net48\NorthwoodLib.dll @@ -173,7 +173,7 @@ - ..\packages\ExMod.Exiled.9.6.0-beta8\lib\net48\YamlDotNet.dll + ..\packages\ExMod.Exiled.9.6.0\lib\net48\YamlDotNet.dll diff --git a/XPSystem/packages.config b/XPSystem/packages.config index de6c3e4..1ddcb21 100644 --- a/XPSystem/packages.config +++ b/XPSystem/packages.config @@ -1,7 +1,7 @@  - + From dbb9a0a0bb1424aea034d894d7e88d40ac9705ab Mon Sep 17 00:00:00 2001 From: moddedmcplayer <76910334+moddedmcplayer@users.noreply.github.com> Date: Sat, 24 May 2025 19:28:44 +0200 Subject: [PATCH 5/6] bump ver --- XPSystem/Main.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/XPSystem/Main.cs b/XPSystem/Main.cs index 2a4037d..907824e 100644 --- a/XPSystem/Main.cs +++ b/XPSystem/Main.cs @@ -25,7 +25,7 @@ public class Main : LabApi.Loader.Features.Plugins.Plugin #endif { - public const string VersionString = "2.0.8"; + public const string VersionString = "2.0.9"; /// /// This number is increased every time the plugin is reloaded. From a1a2a0f6cca778c7fb0fbbf3fd10ad23e290ec5e Mon Sep 17 00:00:00 2001 From: moddedmcplayer <76910334+moddedmcplayer@users.noreply.github.com> Date: Sat, 24 May 2025 19:58:30 +0200 Subject: [PATCH 6/6] console --- XPSystem.Console/App.config | 4 +++ XPSystem.Console/XPSystem.Console.csproj | 42 ++++++++++++------------ XPSystem.Console/packages.config | 2 +- 3 files changed, 26 insertions(+), 22 deletions(-) diff --git a/XPSystem.Console/App.config b/XPSystem.Console/App.config index 34f6c8d..3f1a616 100644 --- a/XPSystem.Console/App.config +++ b/XPSystem.Console/App.config @@ -13,6 +13,10 @@ + + + + \ No newline at end of file diff --git a/XPSystem.Console/XPSystem.Console.csproj b/XPSystem.Console/XPSystem.Console.csproj index a5c8ebc..b99414f 100644 --- a/XPSystem.Console/XPSystem.Console.csproj +++ b/XPSystem.Console/XPSystem.Console.csproj @@ -43,44 +43,44 @@ - ..\packages\ExMod.Exiled.9.1.1\lib\net48\Assembly-CSharp-Publicized.dll + ..\packages\ExMod.Exiled.9.6.0\lib\net48\Assembly-CSharp-Publicized.dll - ..\packages\ExMod.Exiled.9.1.1\lib\net48\CommandSystem.Core.dll + ..\packages\ExMod.Exiled.9.6.0\lib\net48\CommandSystem.Core.dll - - ..\packages\ExMod.Exiled.9.1.1\lib\net48\Exiled.API.dll + + ..\packages\ExMod.Exiled.9.6.0\lib\net48\Exiled.API.dll - - ..\packages\ExMod.Exiled.9.1.1\lib\net48\Exiled.CreditTags.dll + + ..\packages\ExMod.Exiled.9.6.0\lib\net48\Exiled.CreditTags.dll - - ..\packages\ExMod.Exiled.9.1.1\lib\net48\Exiled.CustomItems.dll + + ..\packages\ExMod.Exiled.9.6.0\lib\net48\Exiled.CustomItems.dll - - ..\packages\ExMod.Exiled.9.1.1\lib\net48\Exiled.CustomRoles.dll + + ..\packages\ExMod.Exiled.9.6.0\lib\net48\Exiled.CustomRoles.dll - - ..\packages\ExMod.Exiled.9.1.1\lib\net48\Exiled.Events.dll + + ..\packages\ExMod.Exiled.9.6.0\lib\net48\Exiled.Events.dll - - ..\packages\ExMod.Exiled.9.1.1\lib\net48\Exiled.Loader.dll + + ..\packages\ExMod.Exiled.9.6.0\lib\net48\Exiled.Loader.dll - - ..\packages\ExMod.Exiled.9.1.1\lib\net48\Exiled.Permissions.dll + + ..\packages\ExMod.Exiled.9.6.0\lib\net48\Exiled.Permissions.dll - - ..\packages\ExMod.Exiled.9.1.1\lib\net48\NorthwoodLib.dll + + ..\packages\ExMod.Exiled.9.6.0\lib\net48\LabApi.dll - - ..\packages\ExMod.Exiled.9.1.1\lib\net48\PluginAPI.dll + + ..\packages\ExMod.Exiled.9.6.0\lib\net48\NorthwoodLib.dll - ..\packages\ExMod.Exiled.9.1.1\lib\net48\YamlDotNet.dll + ..\packages\ExMod.Exiled.9.6.0\lib\net48\YamlDotNet.dll diff --git a/XPSystem.Console/packages.config b/XPSystem.Console/packages.config index 3a6171a..603f1d9 100644 --- a/XPSystem.Console/packages.config +++ b/XPSystem.Console/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file