提交: 7093d8fa8159e7e8d1f356433224a5a4c1e818ad - admintoolkit (git)

Administrator's Toolkit VS plugin

Commit MetaInfo

• 修订版: 7093d8fa8159e7e8d1f356433224a5a4c1e818ad (tree)
• 时间: 2020-11-18 10:39:14
• 作者: melchior <melchior@user...>
• Commiter: melchior

Log Message

WIP partly completed ML support

更改概述

• modified: AdminToolkit/ATK_BasicFeatures.cs
• modified: AdminToolkit/AdminToolkit.csproj
• modified: AdminToolkit/AdminToolkitMod.cs
• modified: AdminToolkit/assets/atk/lang/en.json
• modified: AdminToolkit/modinfo.json

差异

--- a/AdminToolkit/ATK_BasicFeatures.cs
+++ b/AdminToolkit/ATK_BasicFeatures.cs
@@ -102,13 +102,22 @@ namespace AdminToolkit
 			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);
+		
+		//No Localized Season/Hemispehere names?		
+		string welcomebackMsg = Lang.Get(@"welcomeback-message",
+				                          elapsedDays,
+				                          ServerAPI.World.AllOnlinePlayers.Length,
+				                          ServerAPI.World.Calendar.GetSeason(playerPos),
+				                          ServerAPI.World.Calendar.GetHemisphere(playerPos)
+										 );
+
+		byPlayer.SendMessage(GlobalConstants.CurrentChatGroup, welcomebackMsg, EnumChatType.OthersMessage);
 		}
 		else {
-		byPlayer.SendMessage(GlobalConstants.CurrentChatGroup, $"In the year; {ServerAPI.World.Calendar.PrettyDate( )}", EnumChatType.OthersMessage);
+		string welcomeMsg = Lang.Get(@"welcome-message",
+									 ServerAPI.World.Calendar.PrettyDate( )
+				                    );
+		byPlayer.SendMessage(GlobalConstants.CurrentChatGroup,welcomeMsg, EnumChatType.OthersMessage);
 		}
 
 		byPlayer.ServerData.CustomPlayerData[AdminToolkit._lastGameDayCountKey] = ServerAPI.World.Calendar.TotalDays.ToString("R");
@@ -116,6 +125,12 @@ 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
@@ -65,6 +65,10 @@
       <HintPath>VS_libs\VintagestoryLib.dll</HintPath>
       <Private>False</Private>
     </Reference>
+    <Reference Include="Newtonsoft.Json">
+      <HintPath>VS_libs\Newtonsoft.Json.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="AdminToolkitMod.cs" />
@@ -78,10 +82,14 @@
     <Compile Include="Commands\PingerCommand.cs" />
     <Compile Include="Commands\VariableSpawnpoints.cs" />
     <Compile Include="ATK_BasicFeatures.cs" />
+    <Compile Include="MultiLang.cs" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="VS_libs\" />
     <Folder Include="Commands\" />
+    <Folder Include="assets\" />
+    <Folder Include="assets\atk\" />
+    <Folder Include="assets\atk\lang\" />
   </ItemGroup>
   <ItemGroup>
     <None Include="modinfo.json">
@@ -89,6 +97,9 @@
     </None>
     <None Include="LICENSE.txt" />
     <None Include="readme.md" />
+    <None Include="assets\atk\lang\en.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file

--- a/AdminToolkit/AdminToolkitMod.cs
+++ b/AdminToolkit/AdminToolkitMod.cs
@@ -32,6 +32,8 @@ namespace AdminToolkit
 		 * [???] Custom Server name : custom formats to indicate server state/time/things
 		 * [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
+		 * 
+		 * WORKAROUND -- Localized messages are by SERVERS Native Language code...Not the players...
 		 */
 
 		private ICoreAPI API { get; set; }

--- a/AdminToolkit/assets/atk/lang/en.json
+++ b/AdminToolkit/assets/atk/lang/en.json
@@ -1 +1,12 @@
-
+{
+    "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}",
+}

--- a/AdminToolkit/modinfo.json
+++ b/AdminToolkit/modinfo.json
@@ -1,11 +1,12 @@
 {
   "type": "code",
   "name": "Administrator's Toolkit mod",
-  "description" : "Provides misc. Admin functions;\n admin listing, rules display (multi-lingual), auto-backup & more...",
+  "ModID":"atk",
+  "description" : "Provides misc. Admin functions;\n admin listing, rules display (multi-lingual), auto-backup & much more.",
   "authors": ["Melchior", ],
   "version": "0.3.6",
   "dependencies": { 
-	"game": "1.13.0"	
+	"game": "1.13.4"	
   },
   "requiredonclient":false,
   "website": "https://osdn.net/users/melchior/pf/admintoolkit/"