提交: a4b36e597c3df04e67017e08d0056bb239cb35ec - admintoolkit (git)

Administrator's Toolkit VS plugin

Commit MetaInfo

• 修订版: a4b36e597c3df04e67017e08d0056bb239cb35ec (tree)
• 时间: 2020-11-08 08:40:18
• 作者: melchior <melchior@user...>
• Commiter: melchior

Log Message

Pre Beta 0.3.5 changes & fixes

更改概述

• add: AdminToolkit/ATK_BasicFeatures.cs
• modified: AdminToolkit/AdminToolkit.csproj
• modified: AdminToolkit/AdminToolkitMod.cs
• modified: AdminToolkit/Commands/BackupCycleCommand.cs
• modified: AdminToolkit/Commands/RulesCommand.cs

差异

--- /dev/null
+++ b/AdminToolkit/ATK_BasicFeatures.cs
@@ -0,0 +1,121 @@
+using System;
+using System.Text;
+using System.Linq;
+using System.Collections.Generic;
+using System.IO;
+
+using Vintagestory.API.Common;
+using Vintagestory.API.Server;
+using Vintagestory.API.Config;
+using Vintagestory.API.Datastructures;
+
+namespace AdminToolkit
+{
+	public partial class AdminToolkit : ModSystem
+	{
+		private void PopulateAdminRoleTable( )
+		{
+		AdminRoles = new List<string>( );
+		foreach (var role in ServerAPI.Server.Config.Roles) {
+
+		if (role.PrivilegeLevel >= 200 && role.Privileges.Any(adminPriviledges.Contains)) {
+
+		AdminRoles.Add(role.Code);
+
+		#if DEBUG
+		Mod.Logger.VerboseDebug("Role {0} =[{1}] considerd Admin-like", role.Name, role.Code);
+		#endif
+		}
+		}
+		}
+
+		private void PrepareServersideConfig( )
+		{
+		AdminModConfig config = ServerAPI.LoadModConfig<AdminModConfig>(_configFilename);
+
+		if (config == null) {
+		//Regen default
+		Mod.Logger.Warning("Regenerating default config as it was missing / unparsable...");
+		ServerAPI.StoreModConfig<AdminModConfig>(new AdminModConfig( ), _configFilename);
+		config = ServerAPI.LoadModConfig<AdminModConfig>(_configFilename);
+		}
+
+		this.CachedConfiguration = config;
+
+		if (this.CachedConfiguration.RuleRoleChangerEnabled) { Mod.Logger.Notification("Admin toolkit; Role change on Rule accept: * ENABLED *"); }
+		}
+
+		/// <summary>
+		/// Makes Administrator text messages appear 'different'
+		/// </summary>
+		/// <returns>The voice of authority.</returns>
+		/// <param name="byPlayer">By player.</param>
+		/// <param name="channelId">Channel identifier.</param>
+		/// <param name="message">Message.</param>
+		/// <param name="consumed">Consumed.</param>		                                      
+		private void BoomingVoiceOfAuthority(IServerPlayer byPlayer, int channelId, ref string message, ref string data, BoolRef consumed)
+		{
+		if (AdminRoles.Contains(byPlayer.Role.Code)) {
+		//Make text lined
+		consumed.value = false;
+		StringBuilder adminMessage = new StringBuilder( );
+		foreach (char letter in message) {
+
+		adminMessage.Append(letter);
+		if (!Char.IsWhiteSpace(letter)) {
+		//adminMessage.Append(@"̅̅̅");
+		adminMessage.Append(@"̲");
+		}
+		}
+
+		message = adminMessage.ToString( );
+		}
+		}
+
+		private void SaveConfigSettings( )
+		{
+		if (this.CachedConfiguration != null) {
+		Mod.Logger.Notification("Persisting configuration.");
+		ServerAPI.StoreModConfig<AdminModConfig>(this.CachedConfiguration, _configFilename);
+		}
+		}
+
+		private void WelcomeMessage(IServerPlayer byPlayer)
+		{
+		if (AdminToolkit.AdminRoles.Contains(byPlayer.Role.Code)) {
+		//Annonce to all players that Admin\Moderator has arrived
+
+		StringBuilder adminMessage = new StringBuilder( );
+
+		adminMessage.AppendFormat("<font color='{1}' weight='bold'>«{0}» {2}</font> Present.", byPlayer.Role.Name, byPlayer.Role.Color.Name, byPlayer.PlayerName);
+
+		ServerAPI.SendMessageToGroup(GlobalConstants.AllChatGroups, adminMessage.ToString( ), EnumChatType.AllGroups);
+
+		byPlayer.ServerData.CustomPlayerData[AdminToolkit._lastLoginKey] = DateTimeOffset.UtcNow.ToString("u");
+		}
+
+		double elapsedDays = 0D;
+		string elapsedDayStr;
+
+		if (byPlayer.ServerData.CustomPlayerData.TryGetValue(AdminToolkit._lastGameDayCountKey, out elapsedDayStr)
+			&&
+			double.TryParse(elapsedDayStr, out elapsedDays)) {
+		elapsedDays = ServerAPI.World.Calendar.TotalDays - elapsedDays;
+		var playerPos = byPlayer.Entity.Pos.AsBlockPos.Copy();
+		//No Localized Season names?
+		var welcomeMsg = $"Meantime... {elapsedDays:F1} days have passed. {ServerAPI.World.AllOnlinePlayers.Length} Players online. It is {ServerAPI.World.Calendar.GetSeason(playerPos)} in the {ServerAPI.World.Calendar.GetHemisphere(playerPos)}.";
+
+		byPlayer.SendMessage(GlobalConstants.CurrentChatGroup, welcomeMsg, EnumChatType.OthersMessage);
+		}
+		else {
+		byPlayer.SendMessage(GlobalConstants.CurrentChatGroup, $"In the year; {ServerAPI.World.Calendar.PrettyDate( )}", EnumChatType.OthersMessage);
+		}
+
+		byPlayer.ServerData.CustomPlayerData[AdminToolkit._lastGameDayCountKey] = ServerAPI.World.Calendar.TotalDays.ToString("R");
+
+
+		}
+
+	}
+}
+

--- a/AdminToolkit/AdminToolkit.csproj
+++ b/AdminToolkit/AdminToolkit.csproj
@@ -77,6 +77,7 @@
     <Compile Include="Commands\BannerControl.cs" />
     <Compile Include="Commands\PingerCommand.cs" />
     <Compile Include="Commands\VariableSpawnpoints.cs" />
+    <Compile Include="ATK_BasicFeatures.cs" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="VS_libs\" />

--- a/AdminToolkit/AdminToolkitMod.cs
+++ b/AdminToolkit/AdminToolkitMod.cs
@@ -15,7 +15,10 @@ namespace AdminToolkit
 	/// <summary>
 	/// Admininstrators toolkit Mod system
 	/// </summary>
-	public class AdminToolkit : ModSystem
+	/// <remarks>
+	/// Boilerplate; all Functions in 'ATK_BasicFeatures.cs'
+	/// </remarks>
+	public partial class AdminToolkit : ModSystem
 	{
 		/* Things it should do:
 		 * ==============
@@ -27,7 +30,7 @@ namespace AdminToolkit
 		 * [DONE] Cyclic automatic Backups
 		 * [WIP} Broadcast messages, on a schedule ??????
 		 * [???] Custom Server name : custom formats to indicate server state/time/things
-		 * [IDEA]: Player inventory Insurance; recover lost items for a (two) time fee... one policy per player.
+		 * [IDEA]: Player VIRTUAL (temp) Inventory; Move Player inventory to alternate [world] D.B. as Inventory backup
 		 * [WIP]: Variable Player (re)Spawn points from a list ~ at random
 		 */
 
@@ -96,87 +99,24 @@ namespace AdminToolkit
 			PopulateAdminRoleTable( );
 			PrepareServersideConfig( );
 
-			this.ServerAPI.RegisterCommand(new RulesCommand(this.ServerAPI) );
+			if (this.CachedConfiguration.RuleRoleChangerEnabled) { this.ServerAPI.RegisterCommand(new RulesCommand(this.ServerAPI)); }
 			this.ServerAPI.RegisterCommand(new AdminListingCommand(this.ServerAPI) );
 			this.ServerAPI.RegisterCommand(new BackupCycleCommand(this.ServerAPI) );
 			//this.ServerAPI.RegisterCommand(new BannerControl(this.ServerAPI));
 			this.ServerAPI.RegisterCommand(new PingerCommand(this.ServerAPI));
-			this.ServerAPI.RegisterCommand(new VariableSpawnpoints(this.ServerAPI));
+			if (this.CachedConfiguration.VariableSpawnpoints) { this.ServerAPI.RegisterCommand(new VariableSpawnpoints(this.ServerAPI)); }
 
 			if (CachedConfiguration.BoomingVoice) {
 				this.ServerAPI.Event.PlayerChat += BoomingVoiceOfAuthority;
 			}
-			//TODO: Server MOTD / Name, DYNAMIC status info [season, moon-phase, events... ect]
 
-			this.ServerAPI.Event.ServerRunPhase(EnumServerRunPhase.Shutdown, SaveConfigSettings);
-		}
-
-		private void PopulateAdminRoleTable( )
-		{
-			AdminRoles = new List<string>( );
-			foreach (var role in ServerAPI.Server.Config.Roles) {
-				
-				if (role.PrivilegeLevel >= 200 && role.Privileges.Any(adminPriviledges.Contains )) {
-					
-					AdminRoles.Add(role.Code);
-
-					#if DEBUG
-					Mod.Logger.VerboseDebug("Role {0} =[{1}] considerd Admin-like", role.Name, role.Code);
-					#endif
-				}
-			}
-		}
-
-		private void PrepareServersideConfig( )
-		{
-			AdminModConfig config = ServerAPI.LoadModConfig<AdminModConfig>(_configFilename);
-
-			if (config == null) {
-				//Regen default
-				Mod.Logger.Warning("Regenerating default config as it was missing / unparsable...");
-				ServerAPI.StoreModConfig<AdminModConfig>(new AdminModConfig( ), _configFilename);
-				config = ServerAPI.LoadModConfig<AdminModConfig>(_configFilename);
-			}
+			this.ServerAPI.Event.PlayerNowPlaying += WelcomeMessage;
 
-			this.CachedConfiguration = config;
 
-			if (this.CachedConfiguration.RuleRoleChangerEnabled) { Mod.Logger.Notification("Admin toolkit; Role change on Rule accept: * ENABLED *"); }
+			this.ServerAPI.Event.ServerRunPhase(EnumServerRunPhase.Shutdown, SaveConfigSettings);
 		}
 
-		/// <summary>
-		/// Makes Administrator text messages appear 'different'
-		/// </summary>
-		/// <returns>The voice of authority.</returns>
-		/// <param name="byPlayer">By player.</param>
-		/// <param name="channelId">Channel identifier.</param>
-		/// <param name="message">Message.</param>
-		/// <param name="consumed">Consumed.</param>		                                      
-		private void BoomingVoiceOfAuthority(IServerPlayer byPlayer, int channelId, ref string message, ref string data, BoolRef consumed)
-		{
-			if (AdminRoles.Contains(byPlayer.Role.Code)) {
-				//Make text lined
-				consumed.value = false;
-				StringBuilder adminMessage = new StringBuilder( );
-				foreach (char letter in message) {
-					
-					adminMessage.Append(letter);
-					if (!Char.IsWhiteSpace(letter)) {
-						//adminMessage.Append(@"̅̅̅");
-						adminMessage.Append(@"̲");
-					}
-				}
-
-				message = adminMessage.ToString( );
-			}
-		}
 
-		private void SaveConfigSettings( )
-		{
-			if (this.CachedConfiguration != null) {				
-				Mod.Logger.Notification("Persisting configuration.");
-				ServerAPI.StoreModConfig<AdminModConfig>(this.CachedConfiguration, _configFilename);
-			}
-		}
 
 }
 }

--- a/AdminToolkit/Commands/BackupCycleCommand.cs
+++ b/AdminToolkit/Commands/BackupCycleCommand.cs
@@ -277,7 +277,7 @@ namespace AdminToolkit
 		{
 			//ServerAPI.WorldManager.CurrentWorldName
 			//ServerAPI.WorldManager.SaveGame.WorldName
-			string worldNameTrimmed = Path.GetFileNameWithoutExtension(ServerAPI.WorldManager.CurrentWorldName);
+			string worldNameTrimmed = Path.GetFileNameWithoutExtension( String.IsNullOrEmpty(ServerAPI.WorldManager.CurrentWorldName) ? GamePaths.DefaultSaveFilenameWithoutExtension : ServerAPI.WorldManager.CurrentWorldName);
 
 			fileFilter = $"{worldNameTrimmed}-*{GlobalConstants.WorldSaveExtension}";
 			Logger.VerboseDebug("File Filter: {0}", fileFilter);

--- a/AdminToolkit/Commands/RulesCommand.cs
+++ b/AdminToolkit/Commands/RulesCommand.cs
@@ -10,6 +10,8 @@ using Vintagestory.API.Server;
 using Vintagestory.API.Common;
 using Vintagestory.API.Config;
 
+using Vintagestory.Client.NoObf;//Perhaps this 'LanguageConfig' moves to a more general place? ...API.Config...
+
 namespace AdminToolkit
 {
 	public class RulesCommand : AdminModCommand
@@ -41,8 +43,8 @@ namespace AdminToolkit
 		{
 			Rules = new Dictionary<string, List<string>>( );
 			RulesPath = ServerAPI.GetOrCreateDataPath(_rulesPathKey);
-
-			string[] lang_codes = { "en", "de", "it", "fr",  "pt-br", "ru" };//FIXME: this should extracted from language codes
+			GuiCompositeSettings.LanguageConfig[] supportedLangs = ServerAPI.Assets.Get<GuiCompositeSettings.LanguageConfig[]>(new AssetLocation("lang/languages.json"));
+			string[ ] lang_codes = supportedLangs.Select(sl => sl.Code).ToArray( );//{ "en", "de", "it", "fr",  "pt-br", "ru" };
 
 			foreach (var languageCode in lang_codes) {
 				//For each locale that is configured... get rules_?.txt
@@ -148,17 +150,7 @@ namespace AdminToolkit
 		/// <param name="byPlayer">By player.</param>
 		private void UponJoin(IServerPlayer byPlayer)
 		{
-			if (AdminToolkit.AdminRoles.Contains(byPlayer.Role.Code)) {
-				//Annonce to all Admin\Moderator is here.
-
-				StringBuilder adminMessage = new StringBuilder( );
-
-				adminMessage.AppendFormat("<font color='{1}' weight='bold'>«{0}» {2}</font> Present.", byPlayer.Role.Name, byPlayer.Role.Color.Name, byPlayer.PlayerName);
-
-				ServerAPI.SendMessageToGroup(GlobalConstants.AllChatGroups, adminMessage.ToString( ), EnumChatType.AllGroups);
-
-				byPlayer.ServerData.CustomPlayerData[AdminToolkit._lastLoginKey] = DateTimeOffset.UtcNow.ToString("u");
-			} else {
+			if (!AdminToolkit.AdminRoles.Contains(byPlayer.Role.Code)) {				
 				//For regular players
 				if (RulesCommand.CheckRuleAccepted(byPlayer) == false) {
 					//TODO: localize 
@@ -169,22 +161,6 @@ namespace AdminToolkit
 					}
 				}
 			}
-
-			double elapsedDays = 0D;
-			string elapsedDayStr;
-
-			if (byPlayer.ServerData.CustomPlayerData.TryGetValue(AdminToolkit._lastGameDayCountKey, out elapsedDayStr)
-				&&
-				double.TryParse(elapsedDayStr, out elapsedDays)) 
-			{
-				elapsedDays = ServerAPI.World.Calendar.TotalDays - elapsedDays;
-				byPlayer.SendMessage(GlobalConstants.CurrentChatGroup, $"Meantime... {elapsedDays:F1} days have passed. {ServerAPI.World.AllOnlinePlayers.Length} Players online.", EnumChatType.OthersMessage);
-			} else 
-			{
-				byPlayer.SendMessage(GlobalConstants.CurrentChatGroup, $"In the year; {ServerAPI.World.Calendar.PrettyDate( )}", EnumChatType.OthersMessage);
-			}
-
-			byPlayer.ServerData.CustomPlayerData[AdminToolkit._lastGameDayCountKey] = ServerAPI.World.Calendar.TotalDays.ToString("R");
 		}
 
 		private void PlayerAcceptsRulesAction(IServerPlayer byPlayer )