Update deps, add warning for non x86 series arch

sgkoishi · Jan 3, 2025 · a56bcbf · a56bcbf
1 parent c740aeb
commit a56bcbf
Show file tree

Hide file tree

Showing 11 changed files with 19 additions and 18 deletions.
diff --git a/Core/AttachedData.cs b/Core/AttachedData.cs
@@ -6,7 +6,7 @@ namespace Chireiden.TShock.Omni;
 
 public partial class Plugin
 {
-    private readonly ConditionalWeakTable<TShockAPI.TSPlayer, AttachedData> _playerData = new ConditionalWeakTable<TShockAPI.TSPlayer, AttachedData>();
+    private readonly ConditionalWeakTable<TShockAPI.TSPlayer, AttachedData> _playerData = [];
 
     public AttachedData? this[TShockAPI.TSPlayer player]
     {
@@ -62,7 +62,7 @@ public AttachedData(TShockAPI.TSPlayer player, int logCount, List<Config.Limiter
         this.Player = player;
         this.PermissionHistory = new Ring<PermissionCheckHistory>(logCount);
         this.RecentPings = Terraria.Main.item.Select(_ => new PendingAck()).ToArray();
-        this.DelayCommands = new List<DelayCommand>();
+        this.DelayCommands = [];
         this.ChatSpamRestrict = chatLimiter.Select(lc => (Limiter) lc).ToArray();
     }
 

diff --git a/Core/CliConfig.cs b/Core/CliConfig.cs
@@ -116,7 +116,6 @@ internal enum PendingConfig
         ///   </item>
         /// </list>
         /// </summary>
-
         MaxPlayers,
 
         /// <summary>
@@ -154,7 +153,6 @@ internal enum PendingConfig
         /// </summary>
         Port,
 
-
         /// <summary>
         /// Order:
         /// <list type="bullet">

diff --git a/Core/Enhancements.cs b/Core/Enhancements.cs
@@ -99,7 +99,7 @@ private void TAHook_NameCollision(TerrariaApi.Server.NameCollisionEventArgs args
     }
 
     internal Dictionary<string, string> _localizedCommandsMap = [];
-    private readonly System.Runtime.CompilerServices.ConditionalWeakTable<TShockAPI.Command, List<string>> _addedAlias = new();
+    private readonly System.Runtime.CompilerServices.ConditionalWeakTable<TShockAPI.Command, List<string>> _addedAlias = [];
     private string Detour_HelpAliases(Func<object, TShockAPI.Command, string> orig, object _instance, TShockAPI.Command command)
     {
         var ac = this.config.Enhancements.Value.ShowCommandAlias.Value;

diff --git a/Core/FirstChance.cs b/Core/FirstChance.cs
@@ -6,7 +6,7 @@ namespace Chireiden.TShock.Omni;
 public partial class Plugin
 {
     private readonly ThreadLocal<int> inFirstChance = new ThreadLocal<int>(() => 0);
-    private readonly HashSet<string> exceptions = new HashSet<string>();
+    private readonly HashSet<string> exceptions = [];
 
     private void FirstChanceExceptionHandler(object? sender, FirstChanceExceptionEventArgs args)
     {

diff --git a/Core/Json.cs b/Core/Json.cs
@@ -7,16 +7,15 @@
 
 namespace Chireiden.TShock.Omni.Json;
 
-
 public static class JsonUtils
 {
-    private static readonly List<JsonConverter> _jsonconverters = new List<JsonConverter>
-    {
+    private static readonly List<JsonConverter> _jsonconverters =
+    [
         new OptionalConverter(),
         new LimiterConverter(),
         new StringEnumConverter(),
         new PacketFilterConverter(),
-    };
+    ];
 
     public static T DeserializeConfig<T>(string value)
     {

diff --git a/Core/Modded.cs b/Core/Modded.cs
@@ -2,7 +2,7 @@
 
 public partial class Plugin
 {
-    private readonly HashSet<PacketTypes> AllowedPackets = new HashSet<PacketTypes>();
+    private readonly HashSet<PacketTypes> AllowedPackets = [];
     private void OTHook_Modded_GetData(object? sender, OTAPI.Hooks.MessageBuffer.GetDataEventArgs args)
     {
         static bool ModdedEarlyChatSpam(int whoAmI, PacketTypes packetId, HashSet<PacketTypes> allowedPackets)

diff --git a/Core/PacketSpam.cs b/Core/PacketSpam.cs
@@ -9,7 +9,7 @@ public partial class Plugin
     internal class ConnectionStore
     {
         public ConcurrentDictionary<string, Connection> Connections { get; } = new ConcurrentDictionary<string, Connection>();
-        public ConditionalWeakTable<Terraria.Net.Sockets.ISocket, AttachedRawData> AttachedData { get; } = new ConditionalWeakTable<Terraria.Net.Sockets.ISocket, AttachedRawData>();
+        public ConditionalWeakTable<Terraria.Net.Sockets.ISocket, AttachedRawData> AttachedData { get; } = [];
 
         internal class Connection
         {

diff --git a/Core/Plugin.cs b/Core/Plugin.cs
@@ -28,6 +28,12 @@ public Plugin(Main game) : base(game)
         Utils.AssemblyMutex(this);
         AppDomain.CurrentDomain.AssemblyResolve += this.AssemblyResolveHandler;
         AppDomain.CurrentDomain.FirstChanceException += this.FirstChanceExceptionHandler;
+        var pa = System.Runtime.InteropServices.RuntimeInformation.ProcessArchitecture;
+        if (pa is not System.Runtime.InteropServices.Architecture.X64 and not System.Runtime.InteropServices.Architecture.X86)
+        {
+            Console.WriteLine($"TShock is running under {pa}, some features may not work.");
+        }
+
         this.Order = -1_000_000;
         this.ReadConfig(Utils.ConsolePlayer.Instance, true);
 

diff --git a/Core/Plugin.csproj b/Core/Plugin.csproj
@@ -31,10 +31,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="TShock" Version="5.2.0">
+    <PackageReference Include="TShock" Version="5.2.1">
       <ExcludeAssets>ContentFiles</ExcludeAssets>
     </PackageReference>
-    <NuGetAuditSuppress Include="https://github.com/advisories/GHSA-hvm9-wc8j-mgrc" />
     <None Include="../README.md" Pack="true" PackagePath="\" />
   </ItemGroup>
 

diff --git a/Misc/Misc.csproj b/Misc/Misc.csproj
@@ -39,10 +39,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="TShock" Version="5.2.0">
+    <PackageReference Include="TShock" Version="5.2.1">
       <ExcludeAssets>ContentFiles</ExcludeAssets>
     </PackageReference>
-    <NuGetAuditSuppress Include="https://github.com/advisories/GHSA-hvm9-wc8j-mgrc" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/SourceGen/SourceGen.csproj b/SourceGen/SourceGen.csproj
@@ -10,8 +10,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.5-beta1.23165.1" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.3.1" />
+    <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.12.0" />
     <Compile Include="../Core/LanguagePolyfill.cs" />
   </ItemGroup>