Commit: cfaa5f6506f37db7a05ae4bcfa7aef5a6d737581 - admintoolkit (git)

Administrator's Toolkit VS plugin

Commit MetaInfo

• Revisão: cfaa5f6506f37db7a05ae4bcfa7aef5a6d737581 (tree)
• Hora: 2020-12-17 10:39:47
• Autor: melchior <melchior@user...>
• Commiter: melchior

Mensagem de Log

D.I.Y. Multi-Lingual support, and to support i18n

Mudança Sumário

• modified: AdminToolkit/ATK_BasicFeatures.cs
• modified: AdminToolkit/AdminToolkit.csproj
• modified: AdminToolkit/AdminToolkitMod.cs
• modified: AdminToolkit/Commands/AdminListingCommand.cs
• modified: AdminToolkit/Commands/RulesCommand.cs
• modified: AdminToolkit/Commands/VariableSpawnpoints.cs
• add: AdminToolkit/Helpers/MultiLang.cs
• modified: AdminToolkit/assets/atk/lang/en.json
• modified: AdminToolkit/modinfo.json

Diff

--- a/AdminToolkit/ATK_BasicFeatures.cs
+++ b/AdminToolkit/ATK_BasicFeatures.cs
@@ -86,8 +86,8 @@ namespace AdminToolkit
 		//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);
+		
+		adminMessage.Append(MultiLang.Get(byPlayer, @"atk:admin_present",byPlayer.Role.Name, byPlayer.Role.Color.Name, byPlayer.PlayerName));
 
 		ServerAPI.SendMessageToGroup(GlobalConstants.AllChatGroups, adminMessage.ToString( ), EnumChatType.AllGroups);
 
@@ -104,7 +104,7 @@ namespace AdminToolkit
 		var playerPos = byPlayer.Entity.Pos.AsBlockPos.Copy();
 		
 		//No Localized Season/Hemispehere names?		
-		string welcomebackMsg = Lang.Get(@"welcomeback-message",
+		string welcomebackMsg = MultiLang.Get(byPlayer, @"atk:welcomeback-message",
 				                          elapsedDays,
 				                          ServerAPI.World.AllOnlinePlayers.Length,
 				                          ServerAPI.World.Calendar.GetSeason(playerPos),
@@ -114,7 +114,7 @@ namespace AdminToolkit
 		byPlayer.SendMessage(GlobalConstants.CurrentChatGroup, welcomebackMsg, EnumChatType.OthersMessage);
 		}
 		else {
-		string welcomeMsg = Lang.Get(@"welcome-message",
+		string welcomeMsg = MultiLang.Get(byPlayer, @"atk:welcome-message",
 									 ServerAPI.World.Calendar.PrettyDate( )
 				                    );
 		byPlayer.SendMessage(GlobalConstants.CurrentChatGroup,welcomeMsg, EnumChatType.OthersMessage);
@@ -124,13 +124,6 @@ namespace AdminToolkit
 
 
 		}
-
-		/* Something like:
-		 
-		string GetLang(string key, string langCode, params object[ ] parameters) //No fallback
-		string GetLang_Fallback(string key, string langCode, params object[ ] parameters) //Uses 'Local' language for missing key
-		
-		*/
 	}
 }
 

--- a/AdminToolkit/AdminToolkit.csproj
+++ b/AdminToolkit/AdminToolkit.csproj
@@ -82,7 +82,7 @@
     <Compile Include="Commands\PingerCommand.cs" />
     <Compile Include="Commands\VariableSpawnpoints.cs" />
     <Compile Include="ATK_BasicFeatures.cs" />
-    <Compile Include="MultiLang.cs" />
+    <Compile Include="Helpers\MultiLang.cs" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="VS_libs\" />
@@ -90,6 +90,7 @@
     <Folder Include="assets\" />
     <Folder Include="assets\atk\" />
     <Folder Include="assets\atk\lang\" />
+    <Folder Include="Helpers\" />
   </ItemGroup>
   <ItemGroup>
     <None Include="modinfo.json">
@@ -100,6 +101,7 @@
     <None Include="assets\atk\lang\en.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Include="MultiLang.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file

--- a/AdminToolkit/AdminToolkitMod.cs
+++ b/AdminToolkit/AdminToolkitMod.cs
@@ -101,6 +101,9 @@ namespace AdminToolkit
 			PopulateAdminRoleTable( );
 			PrepareServersideConfig( );
 
+			MultiLang.Load(Mod.Logger, ServerAPI.Assets, Mod.Info.ModID);
+
+
 			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) );

--- a/AdminToolkit/Commands/AdminListingCommand.cs
+++ b/AdminToolkit/Commands/AdminListingCommand.cs
@@ -32,13 +32,13 @@ namespace AdminToolkit
 					msgLine.AppendFormat("<font color='{2}'>[{0}]</font>  -- \"{1}\" ", srvPlayer.Role.Name, playerName, srvPlayer.Role.Color.Name);
 
 					if (srvPlayer.ConnectionState == EnumClientState.Playing) {
-						msgLine.AppendFormat("IS: <font color='lime'>*{0}*</font>", srvPlayer.ConnectionState);
+						msgLine.AppendFormat("· <font color='lime'>*{0}*</font>", srvPlayer.ConnectionState);
 					} else {
-						msgLine.AppendFormat("IS: <font color='yellow'>{0}</font>", srvPlayer.ConnectionState);
+						msgLine.AppendFormat("· <font color='yellow'>{0}</font>", srvPlayer.ConnectionState);
 					}
 
 					if (srvPlayer.ServerData.CustomPlayerData.ContainsKey(AdminToolkit._lastLoginKey)) {
-						msgLine.AppendFormat(" Last Login: {0}", srvPlayer.ServerData.CustomPlayerData[AdminToolkit._lastLoginKey]);
+						msgLine.AppendFormat("\tΔ : {0}", srvPlayer.ServerData.CustomPlayerData[AdminToolkit._lastLoginKey]);
 					}
 					msgLine.AppendLine( );
 				}

--- a/AdminToolkit/Commands/RulesCommand.cs
+++ b/AdminToolkit/Commands/RulesCommand.cs
@@ -122,10 +122,10 @@ namespace AdminToolkit
 						
 						PlayerAcceptsRulesAction( player);
 					} else {
-						player.SendMessage(groupId, $"{player.PlayerName} ALREADY ACCEPTED RULES!", EnumChatType.CommandSuccess);
+						player.SendMessage(groupId, MultiLang.Get(player, "atk:already-accept",player.PlayerName), EnumChatType.CommandSuccess);
 					}
 				} else {
-					player.SendMessage(groupId, $"{player.PlayerName} type in chat console: /rules {_acceptKeyword}", EnumChatType.CommandError);
+					player.SendMessage(groupId, MultiLang.Get(player, "atk:type-chat-rules", player.PlayerName ,_acceptKeyword), EnumChatType.CommandError);
 				}
 
 			} else {
@@ -139,7 +139,7 @@ namespace AdminToolkit
 					}
 				} else {
 					//Subsitute rules?
-					player.SendMessage(groupId, $"* MISSING RULES FILE ({targetLocale})! *", EnumChatType.CommandError);
+					player.SendMessage(groupId, MultiLang.Get(player, "atk:missing-rules", targetLocale), EnumChatType.CommandError);
 				}
 			}
 		}
@@ -154,7 +154,7 @@ namespace AdminToolkit
 				//For regular players
 				if (RulesCommand.CheckRuleAccepted(byPlayer) == false) {
 					//TODO: localize 
-					byPlayer.SendMessage(GlobalConstants.CurrentChatGroup, "type ' /rules ' command for reading server rules.", EnumChatType.Notification);
+					byPlayer.SendMessage(GlobalConstants.CurrentChatGroup, MultiLang.GetUnformatted(byPlayer,"atk:type-rules"), EnumChatType.Notification);
 
 					if (this.CachedConfiguration.RuleRoleChangerEnabled) {
 						PlayerNeverAcceptedRulesAction(byPlayer);
@@ -165,7 +165,7 @@ namespace AdminToolkit
 
 		private void PlayerAcceptsRulesAction(IServerPlayer byPlayer )
 		{
-			ServerAPI.BroadcastMessageToAllGroups($"{byPlayer.PlayerName} HAS ACCEPTED THE RULES!", EnumChatType.CommandSuccess);
+			ServerAPI.BroadcastMessageToAllGroups(MultiLang.Get(byPlayer,"atk:accepted-rules", byPlayer.PlayerName), EnumChatType.CommandSuccess);
 			byPlayer.ServerData.CustomPlayerData[_ruleAcceptKey] = true.ToString( );
 			ServerAPI.Server.LogNotification($"Player:{byPlayer.PlayerName} UID: {byPlayer.PlayerUID} HAS ACCEPTED RULES @ {DateTime.Now.ToShortDateString( )}");
 
@@ -176,7 +176,7 @@ namespace AdminToolkit
 
 				ServerAPI.Permissions.SetRole(byPlayer, normalRole.Code);
 				Logger.Notification("Player {0} accepted the rules, and was promoted to role: {1}", byPlayer.PlayerName, byPlayer.Role.Name);
-				byPlayer.SendMessage(GlobalConstants.GeneralChatGroup, $"{byPlayer.PlayerName} have been promoted to: {byPlayer.Role.Name}", EnumChatType.OthersMessage);
+				byPlayer.SendMessage(GlobalConstants.GeneralChatGroup, MultiLang.Get(byPlayer, "atk:promoted-to", byPlayer.PlayerName, byPlayer.Role.Name), EnumChatType.OthersMessage);
 			} else {
 				Logger.Debug("Role change process did not complete; not enabled or mis-configured");
 			}
@@ -191,7 +191,7 @@ namespace AdminToolkit
 
 				ServerAPI.Permissions.SetRole(byPlayer, restrainRole.Code);
 				Logger.Notification("Player {0} never accepted rules, and was demoted to role: {1}", byPlayer.PlayerName, byPlayer.Role.Name);
-				byPlayer.SendMessage(GlobalConstants.GeneralChatGroup, $"{byPlayer.PlayerName} have been demoted to: {byPlayer.Role.Name}", EnumChatType.OthersMessage);
+				byPlayer.SendMessage(GlobalConstants.GeneralChatGroup, MultiLang.Get(byPlayer, "atk:demoted-to", byPlayer.PlayerName, byPlayer.Role.Name), EnumChatType.OthersMessage);
 			} 
 		}
 	}

--- a/AdminToolkit/Commands/VariableSpawnpoints.cs
+++ b/AdminToolkit/Commands/VariableSpawnpoints.cs
@@ -137,14 +137,7 @@ namespace AdminToolkit
 
 		private bool AddSpawnpoint(string name, Vec3i position)
 		{
-		//Check position is 'safe'; 2~ blocks air, and solid block BELOW...
-		var surfaceBlock = ServerAPI.World.BlockAccessor.GetBlock(position.AsBlockPos);
-		var aboveBlock = ServerAPI.World.BlockAccessor.GetBlock(position.AddCopy(BlockFacing.UP).AsBlockPos);
-		var belowBlock = ServerAPI.World.BlockAccessor.GetBlock(position.AddCopy(BlockFacing.DOWN).AsBlockPos);
-
-		if (belowBlock.MatterState == EnumMatterState.Solid &&
-			aboveBlock.BlockMaterial == EnumBlockMaterial.Air &&
-			surfaceBlock.BlockMaterial == EnumBlockMaterial.Air) {
+		if (IsItSafe(position.AsBlockPos)) {
 		//Appears OK...
 		Logger.VerboseDebug($"Adding variable spawnpoint '{name}' @ {position}");
 		var newSpawnpoint = new Spawnpoint(name, position);
@@ -159,6 +152,27 @@ namespace AdminToolkit
 		return false;
 		}
 
+		private bool IsItSafe(BlockPos position)
+		{
+		//Check position is 'safe'; 2~ blocks airish, and solid block BELOW...
+		var surfaceBlock = ServerAPI.World.BlockAccessor.GetBlock(position);
+		var aboveBlock = ServerAPI.World.BlockAccessor.GetBlock(position.AddCopy(BlockFacing.UP));
+		var belowBlock = ServerAPI.World.BlockAccessor.GetBlock(position.AddCopy(BlockFacing.DOWN));
+
+		if (belowBlock.MatterState == EnumMatterState.Solid &&
+			aboveBlock.BlockMaterial == EnumBlockMaterial.Air &&
+			surfaceBlock.BlockMaterial == EnumBlockMaterial.Air 
+			|| surfaceBlock.BlockMaterial == EnumBlockMaterial.Snow
+			|| surfaceBlock.BlockMaterial == EnumBlockMaterial.Liquid
+			|| surfaceBlock.BlockMaterial == EnumBlockMaterial.Leaves
+		) 
+		{
+		return true;
+		}
+
+		return false;
+		}
+
 		private bool RemoveSpawnpoint(string name)
 		{
 

--- /dev/null
+++ b/AdminToolkit/Helpers/MultiLang.cs
@@ -0,0 +1,120 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Text.RegularExpressions;
+
+using Newtonsoft.Json;
+
+using Vintagestory.API.Common;
+using Vintagestory.API.Server;
+using Vintagestory.Client.NoObf;
+
+namespace AdminToolkit
+{
+	public static class MultiLang 
+	{
+		public static LanguageSet LanguageSets;
+		public static string[ ] SupportedCodes { get; private set;}
+
+
+		public static void Load(ILogger logger, IAssetManager ownAssetMgr, string domain)
+		{
+		#if DEBUG
+		logger.VerboseDebug("Preparing to load Multi-Linugal data; for '{0}'", domain);
+		#endif
+
+		List<IAssetOrigin> origins = ownAssetMgr.Origins;
+		LanguageSets = new LanguageSet( );
+		
+		GuiCompositeSettings.LanguageConfig[] supportedLangs = ownAssetMgr.Get<GuiCompositeSettings.LanguageConfig[]>(new AssetLocation("lang/languages.json"));
+		SupportedCodes = supportedLangs.Select(sl => sl.Code).ToArray( );//{ "en", "de", "it", "fr",  "pt-br", "ru" };
+
+		List<IAsset> languageAssets = ownAssetMgr.GetMany(@"lang/", domain, true);					
+		foreach (var asset in languageAssets) {		
+			try {			
+			LanguageSets.Add(new LangEntry(asset));
+			#if DEBUG
+			logger.VerboseDebug("Appended M.l. Dicts: with '{0}'", asset.Name);
+			#endif
+		} catch (Exception e) {
+			logger.Error("Failed to process multi-lang file {0}: {1}", asset.Location, e);
+			}
+		}
+		}
+
+
+
+		public static string Get(string langCode, string key, params object[] formaters)
+		{
+		if (LanguageSets.Contains(langCode)) 
+		{
+		LangEntry langD = LanguageSets[langCode];
+		if (langD.LangEntries.ContainsKey(key)) {
+		return string.Format(langD.LangEntries[key], formaters);
+		}					
+		}
+		return key;
+		}
+
+		public static string Get(IServerPlayer byPlayerLang, string key, params object[ ] formaters)
+		{
+		if (LanguageSets.Contains(byPlayerLang.LanguageCode)) {
+		LangEntry langD = LanguageSets[byPlayerLang.LanguageCode];
+		if (langD.LangEntries.ContainsKey(key)) {
+		return string.Format(langD.LangEntries[key], formaters);
+		}
+		}
+		return key;
+		}
+
+		public static string GetUnformatted(IServerPlayer byPlayerLang, string key)
+		{
+		if (LanguageSets.Contains(byPlayerLang.LanguageCode)) {
+		LangEntry langD = LanguageSets[byPlayerLang.LanguageCode];
+		if (langD.LangEntries.ContainsKey(key)) {
+		return langD.LangEntries[key];
+		}
+		}
+		return key;
+		}
+	}
+
+	public class LanguageSet : KeyedCollection<string, LangEntry>
+	{
+		protected override string GetKeyForItem(LangEntry item)
+		{
+		return item.Code;
+		}
+	}
+
+	public struct LangEntry
+	{
+		public Dictionary<string, string> LangEntries;
+		//public Dictionary<string, KeyValuePair<Regex, string>> LangRegexes;
+		//public Dictionary<string, string> LangStartsWith;
+		public readonly string Code;
+
+		public LangEntry( string langCode = "en")
+		{
+		LangEntries = new Dictionary<string, string>( );
+		//LangRegexes = new Dictionary<string, KeyValuePair<Regex, string>>( );
+		//LangStartsWith = new Dictionary<string, string>( );
+		Code = langCode;
+		}
+
+		public LangEntry(IAsset langAsset)
+		{
+		if (langAsset.IsLoaded( )) {
+		LangEntries = JsonConvert.DeserializeObject<Dictionary<string, string>>(langAsset.ToText( ));
+		}
+		else {
+		LangEntries = new Dictionary<string, string>( );
+		}
+		//LangRegexes = new Dictionary<string, KeyValuePair<Regex, string>>( );
+		//LangStartsWith = new Dictionary<string, string>( );
+		Code = langAsset.Name.Split('.').First( );
+		}
+	}
+}
+

--- a/AdminToolkit/assets/atk/lang/en.json
+++ b/AdminToolkit/assets/atk/lang/en.json
@@ -1,12 +1,13 @@
 {
-    "welcomeback-message": "Meantime... {0:F1} days have passed. {1} Players online. It is {2} in the {3}.",
-    "welcome-message":"In the year; {0}",
-	"display-rules":"Display server Rules",
-	"already-accept":"{0} ALREADY ACCEPTED RULES!",
-	"type-chat-rules":"{0} type in chat console: /rules {1}",
-	"missing-rules":"* MISSING RULES FILE ({0})! *",
-	"type-rules":"type ' /rules ' command for reading server rules.",
-	"accepted-rules":"{0} HAS ACCEPTED THE RULES!",
-	"promoted-to":"{0} have been promoted to: {1}",
-	"demoted-to":"{0} have been demoted to: {1}",
+	"atk:admin_present":"<font color='{1}' weight='bold'>«{0}» {2}</font> Present.",
+    "atk:welcomeback-message": "Meantime... {0:F1} days have passed. {1} Players online. It is {2} in the {3}.",
+    "atk:welcome-message":"In the year; {0}",
+	"atk:display-rules":"Display server Rules",
+	"atk:already-accept":"{0} ALREADY ACCEPTED RULES!",
+	"atk:type-chat-rules":"{0} type in chat console: /rules {1}",
+	"atk:missing-rules":"* MISSING RULES FILE ({0})! *",
+	"atk:type-rules":"type ' /rules ' command for reading server rules.",
+	"atk:accepted-rules":"{0} HAS ACCEPTED THE RULES!",
+	"atk:promoted-to":"{0} have been promoted to: {1}",
+	"atk:demoted-to":"{0} have been demoted to: {1}",
 }

--- a/AdminToolkit/modinfo.json
+++ b/AdminToolkit/modinfo.json
@@ -6,7 +6,7 @@
   "authors": ["Melchior", ],
   "version": "0.3.6",
   "dependencies": { 
-	"game": "1.13.4"	
+	"game": "1.14.0"	
   },
   "requiredonclient":false,
   "website": "https://osdn.net/users/melchior/pf/admintoolkit/"