fix(server): fix visibility of some functions

DanielMcAssey · Jan 24, 2025 · 9f3b9f4 · 9f3b9f4
1 parent cc04ecd
commit 9f3b9f4
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 31 deletions.
diff --git a/GLOKON.Baiters.Core/ActorSpawner.cs b/GLOKON.Baiters.Core/ActorSpawner.cs
@@ -32,7 +32,7 @@ public ActorSpawner(IOptions<WebFishingOptions> _options, BaitersServer server)
             spawnProbabilities.Add(ActorType.VoidPortal, (long)(options.Modifiers.VoidPortalChance * 1000));
         }
 
-        public async Task RunAsync(CancellationToken cancellationToken)
+        internal async Task RunAsync(CancellationToken cancellationToken)
         {
             while (!cancellationToken.IsCancellationRequested)
             {

diff --git a/GLOKON.Baiters.Core/BaitersServer.cs b/GLOKON.Baiters.Core/BaitersServer.cs
@@ -123,7 +123,7 @@ public BaitersServer(IOptions<WebFishingOptions> _options)
             }
         }
 
-        public virtual void Setup()
+        internal virtual void Setup()
         {
             Log.Information("Setting up server...");
 
@@ -140,7 +140,7 @@ public virtual void Setup()
             Log.Information("Server setup");
         }
 
-        public virtual async Task RunAsync(CancellationToken cancellationToken)
+        internal virtual async Task RunAsync(CancellationToken cancellationToken)
         {
             if (!string.IsNullOrWhiteSpace(options.CustomLobbyCode))
             {
@@ -192,7 +192,7 @@ public virtual async Task RunAsync(CancellationToken cancellationToken)
             }
         }
 
-        public virtual void Stop()
+        internal virtual void Stop()
         {
             Log.Information("Stopping server...");
 

diff --git a/GLOKON.Baiters.Core/NetworkMessageBaitersServer.cs b/GLOKON.Baiters.Core/NetworkMessageBaitersServer.cs
@@ -13,7 +13,7 @@ public sealed class NetworkMessageBaitersServer(IOptions<WebFishingOptions> opti
     {
         private readonly ConcurrentDictionary<ulong, NetIdentity> _connections = new();
 
-        public override void Setup()
+        internal override void Setup()
         {
             base.Setup();
 
@@ -22,7 +22,7 @@ public override void Setup()
             SteamNetworkingMessages.OnMessage += SteamNetworkingMessages_OnMessage;
         }
 
-        public override void Stop()
+        internal override void Stop()
         {
             base.Stop();
 
@@ -65,25 +65,6 @@ protected override void SendPacketTo(byte[] data, DataChannel channel, ulong ste
             }
         }
 
-        private bool TryGetConnection(ulong steamId, out NetIdentity netIdentity)
-        {
-            if (_connections.TryGetValue(steamId, out netIdentity))
-            {
-                return true;
-            }
-
-            try
-            {
-                _connections.TryAdd(steamId, (NetIdentity)(SteamId)steamId);
-                return true;
-            }
-            catch (Exception ex)
-            {
-                Log.Error(ex, "Failed to convert SteamID to NetIdentity for {0}", steamId);
-                return false;
-            }
-        }
-
         private void InternalSendPacket(ulong steamId, NetIdentity netIdentity, byte[] data, DataChannel channel, bool reliable)
         {
             if (SteamNetworkingMessages.SendMessageToUser(ref netIdentity, data, data.Length, (int)channel, reliable ? SendType.Reliable : SendType.Unreliable) != Result.OK)

diff --git a/GLOKON.Baiters.Core/P2PBaitersServer.cs b/GLOKON.Baiters.Core/P2PBaitersServer.cs
@@ -8,7 +8,7 @@ namespace GLOKON.Baiters.Core
 {
     public sealed class P2PBaitersServer(IOptions<WebFishingOptions> options) : BaitersServer(options)
     {
-        public override void Setup()
+        internal override void Setup()
         {
             base.Setup();
 

diff --git a/GLOKON.Baiters.Core/SocketBaitersServer.cs b/GLOKON.Baiters.Core/SocketBaitersServer.cs
@@ -6,7 +6,6 @@
 using Steamworks.Data;
 using System.Collections.Concurrent;
 using System.Runtime.InteropServices;
-using System.Security.Principal;
 
 namespace GLOKON.Baiters.Core
 {
@@ -16,13 +15,13 @@ public sealed class SocketBaitersServer(IOptions<WebFishingOptions> options) : B
 
         private SocketManager? _socketManager;
 
-        public override Task RunAsync(CancellationToken cancellationToken)
+        internal override Task RunAsync(CancellationToken cancellationToken)
         {
             _socketManager = SteamNetworkingSockets.CreateRelaySocket(0, this);
             return base.RunAsync(cancellationToken);
         }
 
-        public override void Stop()
+        internal override void Stop()
         {
             if (_socketManager != null)
             {

diff --git a/GLOKON.Baiters.Plugins.ChatCommand/ChatCommandPlugin.cs b/GLOKON.Baiters.Plugins.ChatCommand/ChatCommandPlugin.cs
@@ -1,6 +1,5 @@
 using GLOKON.Baiters.Core;
 using GLOKON.Baiters.Core.Constants;
-using GLOKON.Baiters.Core.Models.Game;
 using GLOKON.Baiters.Core.Plugins;
 using System.Reflection;
 

diff --git a/PLUGINS.md b/PLUGINS.md
@@ -2,7 +2,10 @@
 
 Building plugins for Baiters is really easy!
 
-There is an example plugin on this repository, the ChatCommands plugin, so feel free to use that as a basis.
+Save time by using the [plugin template repository](https://github.com/DanielMcAssey/baiters-server-plugin-example) to create your plugin.
+
+Alternatively, there is an example plugin on this repository, the ChatCommands plugin, so feel free to use that as a basis.
+
 
 ## Steps