📦 Packaging for Thunderstore release, nit formating +semver:minor

Author: decaprime

.editorconfig

@@ -9,16 +9,19 @@ indent_style = tab
 indent_style = space
 indent_size = 2
 
+
+
 [*.cs]
 # Organize usings
 dotnet_separate_import_directive_groups = false
 dotnet_sort_system_directives_first = true
 file_header_template = unset
-
+# IDE0005: Using directive is unnecessary.
+dotnet_diagnostic.IDE0005.severity = suggestion
 csharp_using_directive_placement = outside_namespace:silent
 csharp_prefer_simple_using_statement = true:suggestion
 csharp_prefer_braces = true:silent
-csharp_style_namespace_declarations = file_scoped:suggestion
+csharp_style_namespace_declarations = file_scoped:warning
 csharp_style_prefer_method_group_conversion = true:silent
 csharp_style_prefer_top_level_statements = true:silent
 csharp_style_expression_bodied_methods = false:silent

Commands.cs

@@ -19,8 +19,8 @@ public void TopCommand(ChatCommandContext ctx)
 
 		offset = offset > topKillers.Length ? topKillers.Length : offset;
 		num = num > topKillers.Length ? topKillers.Length : num;
-		
-		
+
+
 
 		var pad = (string name) => new string('\t'.Repeat(6 - name.Length / 5).ToArray());
 

DataStore.cs

@@ -201,7 +201,7 @@ PlayerStatistics UpsertName(ulong steamId, string name, string clanName)
 		// while this is naieve and whole file, in append or WAL this might be better
 		WriteToDisk();
 	}
-	
+
 	private static void AnnounceKill(PlayerStatistics victimUser, PlayerStatistics killerUser, int lostStreakAmount)
 	{
 		if (!Settings.AnnounceKills) return;
@@ -225,7 +225,7 @@ private static void AnnounceKill(PlayerStatistics victimUser, PlayerStatistics k
 		};
 
 		ServerChatUtils.SendSystemMessageToAllClients(VWorld.Server.EntityManager, Markup.Prefix + message);
-		
+
 		if (!string.IsNullOrEmpty(killMsg) && Settings.AnnounceKillstreak)
 		{
 			ServerChatUtils.SendSystemMessageToAllClients(VWorld.Server.EntityManager, Markup.Prefix + killMsg);

ECSExtensions.cs

@@ -22,11 +22,11 @@ internal static void With<T>(this Entity entity, VExtensions.ActionRef<T> action
 	internal static bool Has<T>(this Entity entity) where T : struct
 	{
 		int typeIndex = TypeManager.GetTypeIndex(Il2CppType.Of<T>());
-		
+
 		return VWorld.Game.EntityManager.HasComponentRaw(entity, typeIndex);
 	}
 
-	internal unsafe static T RW<T>(this Entity entity) where T: struct
+	internal unsafe static T RW<T>(this Entity entity) where T : struct
 	{
 		int typeIndex = TypeManager.GetTypeIndex(Il2CppType.Of<T>());
 		T* componentDataRawRW = (T*)VWorld.Game.EntityManager.GetComponentDataRawRW(entity, typeIndex);
@@ -41,7 +41,7 @@ internal unsafe static T Read<T>(this Entity entity) where T : struct
 	{
 		int typeIndex = TypeManager.GetTypeIndex(Il2CppType.Of<T>());
 		T* componentDataRawRO = (T*)VWorld.Game.EntityManager.GetComponentDataRawRO(entity, typeIndex);
-		if(componentDataRawRO == null)
+		if (componentDataRawRO == null)
 		{
 			throw new InvalidOperationException($"Failure to access ReadOnly <{typeof(T).Name}> typeIndex({typeIndex}) on entity({entity}).");
 		}

Killfeed.csproj

@@ -15,11 +15,11 @@
 		<Copy SourceFiles="$(OutDir)\Killfeed.dll" DestinationFolder="$(ProjectDir)/dist" />
 	</Target>
   <ItemGroup>
-    <PackageReference Include="BepInEx.Unity.IL2CPP" Version="6.0.0-be.668" IncludeAssets="compile" />
-    <PackageReference Include="BepInEx.Core" Version="6.0.0-be.668" IncludeAssets="compile" />
+    <PackageReference Include="BepInEx.Unity.IL2CPP" Version="6.0.0-be.691" IncludeAssets="compile" />
+    <PackageReference Include="BepInEx.Core" Version="6.0.0-be.691" IncludeAssets="compile" />
     <PackageReference Include="BepInEx.PluginInfoProps" Version="2.*" />
-    <PackageReference Include="VRising.Unhollowed.Client" Version="1.0.0.*" />
-    <PackageReference Include="VRising.VampireCommandFramework" Version="0.8.*" />
-    <PackageReference Include="VRising.Bloodstone" Version="0.1.*" />
+    <PackageReference Include="VRising.Unhollowed.Client" Version="1.0.*" />
+    <PackageReference Include="VRising.VampireCommandFramework" Version="0.9.*" />
+    <PackageReference Include="VRising.Bloodstone" Version="0.2.*" />
   </ItemGroup>
 </Project>

Plugin.cs

@@ -1,4 +1,4 @@
-using System.Diagnostics;
+using System.Diagnostics;
 using BepInEx;
 using BepInEx.Logging;
 using BepInEx.Unity.IL2CPP;
@@ -14,30 +14,29 @@ namespace Killfeed;
 [Bloodstone.API.Reloadable]
 public partial class Plugin : BasePlugin
 {
-    Harmony _harmony;
-    public static ManualLogSource Logger;
-    public override void Load()
-    {
-        Logger = Log;
-        // Plugin startup logic
-        Log.LogInfo($"Plugin {MyPluginInfo.PLUGIN_GUID} version {MyPluginInfo.PLUGIN_VERSION} is loaded!");
+	Harmony _harmony;
+	public static ManualLogSource Logger;
+	public override void Load()
+	{
+		Logger = Log;
+		// Plugin startup logic
+		Log.LogInfo($"Plugin {MyPluginInfo.PLUGIN_GUID} version {MyPluginInfo.PLUGIN_VERSION} is loaded!");
 
-        // Harmony patching
-        _harmony = new Harmony(MyPluginInfo.PLUGIN_GUID);
-        _harmony.PatchAll(System.Reflection.Assembly.GetExecutingAssembly());
+		// Harmony patching
+		_harmony = new Harmony(MyPluginInfo.PLUGIN_GUID);
+		_harmony.PatchAll(System.Reflection.Assembly.GetExecutingAssembly());
 
-        // Register all commands in the assembly with VCF
-        CommandRegistry.RegisterAll();
+		// Register all commands in the assembly with VCF
+		CommandRegistry.RegisterAll();
+		Settings.Initialize(Config);
 
-        Settings.Initialize(Config);
+		DataStore.LoadFromDisk();
+	}
 
-        DataStore.LoadFromDisk();
-    }
-
-    public override bool Unload()
-    {
-        CommandRegistry.UnregisterAssembly();
-        _harmony?.UnpatchSelf();
-        return true;
-    }
-}
+	public override bool Unload()
+	{
+		CommandRegistry.UnregisterAssembly();
+		_harmony?.UnpatchSelf();
+		return true;
+	}
+}

README.md

@@ -1,8 +1,6 @@
 ![](logo.png)
 # Killfeed - PvP Announcer and Statistics
 
-## `BETA`
-
 ## Features
 - Announce PvP kills in chat
 - Kill Leaderboard
@@ -13,4 +11,12 @@
 ## Upcoming features
 - Announce kill streaks
 - Announce multi-kills
-- Track by clan
+- Track by clan
+
+## https://vrisingmods.com/discord
+
+# Changelog
+- 0.2.0
+	- Update for 1.0
+- 0.1.0
+	- Initial release

VampireDownedHook.cs

@@ -1,4 +1,4 @@
-using Bloodstone.API;
+using Bloodstone.API;
 using HarmonyLib;
 using ProjectM;
 using Unity.Collections;
@@ -10,62 +10,62 @@ namespace Killfeed;
 [HarmonyPatch(typeof(VampireDownedServerEventSystem), nameof(VampireDownedServerEventSystem.OnUpdate))]
 public static class VampireDownedHook
 {
-    public static void Prefix(VampireDownedServerEventSystem __instance)
-    {
-        var downedEvents = __instance.__query_1174204813_0.ToEntityArray(Allocator.Temp);
-        foreach (var entity in downedEvents)
-        {
-            ProcessVampireDowned(entity);
-        }
-    }
-
-    private static void ProcessVampireDowned(Entity entity)
-    {
-        
-        if(!VampireDownedServerEventSystem.TryFindRootOwner(entity, 1, VWorld.Server.EntityManager, out var victimEntity))
-        {
-            Plugin.Logger.LogMessage("Couldn't get victim entity");
-            return;
-        }
-		
+	public static void Prefix(VampireDownedServerEventSystem __instance)
+	{
+		var downedEvents = __instance.__query_1174204813_0.ToEntityArray(Allocator.Temp);
+		foreach (var entity in downedEvents)
+		{
+			ProcessVampireDowned(entity);
+		}
+	}
+
+	private static void ProcessVampireDowned(Entity entity)
+	{
+
+		if (!VampireDownedServerEventSystem.TryFindRootOwner(entity, 1, VWorld.Server.EntityManager, out var victimEntity))
+		{
+			Plugin.Logger.LogMessage("Couldn't get victim entity");
+			return;
+		}
+
 		var downBuff = entity.Read<VampireDownedBuff>();
 
-		
+
 		if (!VampireDownedServerEventSystem.TryFindRootOwner(downBuff.Source, 1, VWorld.Server.EntityManager, out var killerEntity))
 		{
 			Plugin.Logger.LogMessage("Couldn't get victim entity");
 			return;
 		}
-		
+
 		var victim = victimEntity.Read<PlayerCharacter>();
 
 		Plugin.Logger.LogMessage($"{victim.Name} is victim");
 		var unitKiller = killerEntity.Has<UnitLevel>();
-		
+
 		if (unitKiller)
-        {
+		{
 			Plugin.Logger.LogInfo($"{victim.Name} was killed by a unit. [Not currently tracked]");
-            return;
+			return;
 		}
 
 		var playerKiller = killerEntity.Has<PlayerCharacter>();
 
 		if (!playerKiller)
-        {
-            Plugin.Logger.LogWarning($"Let deca know there is another killer abouts and it's not a player or a unit.");
-            return;
-        }
-		
+		{
+			Plugin.Logger.LogWarning($"Killer could not be identified for {victim.Name}, if you know how to reproduce this please contact deca on discord or report on github");
+			return;
+		}
+
 		var killer = killerEntity.Read<PlayerCharacter>();
 
 		if (killer.UserEntity == victim.UserEntity)
-        {
-            Plugin.Logger.LogInfo($"{victim.Name} killed themselves. [Not currently tracked]");
-            return;
-        }
-		
-        var location = victimEntity.Read<LocalToWorld>();
-		
-        DataStore.RegisterKillEvent(victim, killer, location.Position);
-    }
+		{
+			Plugin.Logger.LogInfo($"{victim.Name} killed themselves. [Not currently tracked]");
+			return;
+		}
+
+		var location = victimEntity.Read<LocalToWorld>();
+
+		DataStore.RegisterKillEvent(victim, killer, location.Position);
+	}
 }

thunderstore.toml

@@ -4,15 +4,15 @@ schemaVersion = "0.0.1"
 [package]
 namespace = "deca"
 name = "Killfeed"
-versionNumber = "0.1.0"
+versionNumber = "0.2.0"
 description = "PvP Leaderboard and Killfeed Announcements"
 websiteUrl = "https://github.com/decaprime/Killfeed"
 containsNsfwContent = false
 
 [package.dependencies]
-BepInEx-BepInExPack_V_Rising = "1.668.5"
-deca-VampireCommandFramework = "0.8.0"
-deca-Bloodstone = "0.1.4"
+BepInEx-BepInExPack_V_Rising = "1.691.3"
+deca-VampireCommandFramework = "0.9.0"
+deca-Bloodstone = "0.2.2"
 
 [build]
 icon = "./logo.png"
@@ -24,6 +24,8 @@ source = "./dist"
 target = ""
 
 [publish]
-repository = "https://v-rising.thunderstore.io"
+repository = "https://thunderstore.io"
 communities = ["v-rising"]
-categories = ["gloomrot-update", "mods", "server"]
+
+[publish.categories]
+v-rising = ["gloomrot-update", "mods", "server"]