提交: d1e59dde8764d39e620ace3a46df64495471949b - admintoolkit (git)

Administrator's Toolkit VS plugin

Commit MetaInfo

• 修訂: d1e59dde8764d39e620ace3a46df64495471949b (tree)
• 時間: 2020-04-26 06:50:39
• 作者: melchior <melchior@user...>
• Commiter: melchior

Log Message

{VS: V1.12.X } = ATK 0.3.4, updated for API changes (backup sys.),
better Admin listing

Change Summary

• modified: AdminToolkit/AdminToolkit.csproj
• modified: AdminToolkit/AdminToolkitMod.cs
• modified: AdminToolkit/Commands/AdminListingCommand.cs
• modified: AdminToolkit/Commands/BackupCycleCommand.cs
• modified: AdminToolkit/Commands/BannerControl.cs
• modified: AdminToolkit/Commands/RulesCommand.cs
• delete: AdminToolkit/MechTurk.cs
• modified: AdminToolkit/modinfo.json

差異

--- a/AdminToolkit/AdminToolkit.csproj
+++ b/AdminToolkit/AdminToolkit.csproj
@@ -74,7 +74,6 @@
     <Compile Include="Commands\AdminListingCommand.cs" />
     <Compile Include="Commands\BackupCycleCommand.cs" />
     <Compile Include="Commands\RulesCommand.cs" />
-    <Compile Include="MechTurk.cs" />
     <Compile Include="Commands\BannerControl.cs" />
   </ItemGroup>
   <ItemGroup>

--- a/AdminToolkit/AdminToolkitMod.cs
+++ b/AdminToolkit/AdminToolkitMod.cs
@@ -97,6 +97,7 @@ namespace AdminToolkit
 			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));
 
 			if (CachedConfiguration.BoomingVoice) {
 				this.ServerAPI.Event.PlayerChat += BoomingVoiceOfAuthority;

--- a/AdminToolkit/Commands/AdminListingCommand.cs
+++ b/AdminToolkit/Commands/AdminListingCommand.cs
@@ -28,7 +28,8 @@ namespace AdminToolkit
 			foreach (var srvPlayer in ServerAPI.Server.Players) {
 				if (AdminToolkit.AdminRoles.Contains(srvPlayer.Role.Code)) {
 
-					msgLine.AppendFormat("<font color='{2}'>[{0}]</font>  -- \"{1}\" ", srvPlayer.Role.Name, srvPlayer.PlayerName, srvPlayer.Role.Color.Name);
+					string playerName = srvPlayer.PlayerName ?? srvPlayer?.ServerData.LastKnownPlayername ?? "?";
+					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);

--- a/AdminToolkit/Commands/BackupCycleCommand.cs
+++ b/AdminToolkit/Commands/BackupCycleCommand.cs
@@ -16,7 +16,7 @@ namespace AdminToolkit
 	{
 		private long backupTickerID;
 		private const string _timeFormat = @"d\D\ hh\H\ mm\M\ ss\S";
-		private MechTurk mechanicalTurk;
+
 
 		private DateTimeOffset _lastBackupTime = DateTimeOffset.MinValue;
 
@@ -30,7 +30,7 @@ namespace AdminToolkit
 			this.RequiredPrivilege = Privilege.controlserver;//"Backup" ?
 			this.Syntax = "enable / disable /  delay [hours] / stats";
 
-			mechanicalTurk = new MechTurk(ServerAPI.Server.Config.Roles.Find(ro => ro.Code == "admin"), this.Logger);
+
 
 			ServerAPI.Event.ServerRunPhase(EnumServerRunPhase.RunGame, ServerStarts);
 		}
@@ -172,16 +172,8 @@ namespace AdminToolkit
 			}
 
 
-			if (ServerAPI.World is ServerMain) {
-
-				ServerMain serverMain = ServerAPI.World as ServerMain;
-				serverMain.EventManager.TriggerChatCommand(mechanicalTurk, GlobalConstants.ServerInfoChatGroup, @"genbackup", new CmdArgs( ));
-				_lastBackupTime = DateTimeOffset.UtcNow;
-			} else {
-				Logger.Warning("Could not invoke backup command - API (implimentation) has changed, Contact Developer!");
-				this.backupTickerID = 0;
-				return;
-			}
+			ServerAPI.InjectConsole(@"/genbackup");
+			_lastBackupTime = DateTimeOffset.UtcNow;
 
 			this.backupTickerID = ServerAPI.Event.RegisterCallback(BackupCycleHandler, ( int )this.CachedConfiguration.BackupDelay.TotalMilliseconds);
 			Logger.Notification("BackupCycle re-engaged, delay: {0} next time: {1}", this.CachedConfiguration.BackupDelay.ToString(_timeFormat), DateTimeOffset.UtcNow.Add(this.CachedConfiguration.BackupDelay).ToString("u"));

--- a/AdminToolkit/Commands/BannerControl.cs
+++ b/AdminToolkit/Commands/BannerControl.cs
@@ -1,15 +1,46 @@
 using System;
 
+using Vintagestory.API.Common;
 using Vintagestory.API.Server;
 
 namespace AdminToolkit
 {
 	public class BannerControl : AdminModCommand
 	{
+		/// <summary>
+		/// Control and Configuration of automatic Broadcast 'banners' / M.O.T.H.
+		/// </summary>
 		public BannerControl(ICoreServerAPI _serverAPI) : base(_serverAPI)
 		{
-			
+
+		//Add <slot#> "text" <repeat/once>  <DD:HH:MM:SS - DD/MM
+		//Remove <slot#>
+		//Replace <slot#> "text"
+		//List
+
+		//Mode:
+		//Repeating (Per unit of time), Once (Future-Date)
+
+		//Delay;
+		//HH:MM:SS
+		ServerAPI.Event.ServerRunPhase(EnumServerRunPhase.RunGame, ReactivateBanners);
+
+		this.Command = "banners";
+		this.Description = "Control future broadcast 'banners' or repeating Messages";
+		this.RequiredPrivilege = Privilege.announce;
+		this.handler += HandleBannerCommand;
+		}
+
+		private void ReactivateBanners( )
+		{
+
 		}
-	}
+
+
+		private void HandleBannerCommand(IServerPlayer player, int groupId, CmdArgs args)
+		{
+
+		}
+}
 }
 

--- a/AdminToolkit/Commands/RulesCommand.cs
+++ b/AdminToolkit/Commands/RulesCommand.cs
@@ -153,7 +153,7 @@ namespace AdminToolkit
 
 				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.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);
 

--- a/AdminToolkit/MechTurk.cs
+++ /dev/null
@@ -1,210 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-using Vintagestory.API.Common;
-using Vintagestory.API.Common.Entities;
-using Vintagestory.API.Server;
-
-namespace AdminToolkit
-{
-	public class MechTurk: IPlayer, IServerPlayer
-	{
-		private ILogger Logger;
-
-		public MechTurk( IPlayerRole role, ILogger logger)
-		{
-			this.Role = role;
-			Logger = logger;
-		}
-
-		public int ClientId {
-			get {
-				return -1;
-			}
-		}
-
-		public EnumClientState ConnectionState {
-			get {
-				return EnumClientState.Connected;
-			}
-		}
-
-		public BlockSelection CurrentBlockSelection {
-			get {
-				throw new NotImplementedException( );
-			}
-		}
-
-		public int CurrentChunkSentRadius {
-			get {
-				throw new NotImplementedException( );
-			}
-
-			set {
-				throw new NotImplementedException( );
-			}
-		}
-
-		public EntitySelection CurrentEntitySelection {
-			get {
-				throw new NotImplementedException( );
-			}
-		}
-
-		public List<Entitlement> Entitlements {
-			get {
-				throw new NotImplementedException( );
-			}
-		}
-
-		public EntityPlayer Entity {
-			get {
-				throw new NotImplementedException( );
-			}
-		}
-
-		public PlayerGroupMembership[] Groups {
-			get {
-				throw new NotImplementedException( );
-			}
-		}
-
-		public IPlayerInventoryManager InventoryManager {
-			get {
-				throw new NotImplementedException( );
-			}
-		}
-
-		public string IpAddress {
-			get {
-				return @"127.0.0.1";
-			}
-		}
-
-		public string LanguageCode {
-			get {
-				return @"en";//ISO639-2 ?
-			}
-		}
-
-		public float Ping {
-			get {
-				return 0.0f;
-			}
-		}
-
-		public string PlayerName {
-			get {
-				return @"Mechanical Turk";
-			}
-		}
-
-		public string PlayerUID {
-			get {
-				return @"console";//Keeps 'ServerEventManager' satisfied
-			}
-		}
-
-		public string[] Privileges {
-			get {
-				return new[]{
-				Privilege.buildblockseverywhere,
-				Privilege.useblockseverywhere,
-				Privilege.gamemode,
-				Privilege.pickingrange,
-				Privilege.kick,
-				Privilege.ban,
-				Privilege.whitelist,
-				Privilege.setwelcome,
-				Privilege.announce,
-				Privilege.readlists,
-				Privilege.give,
-				Privilege.setspawn,
-				Privilege.controlserver,
-				Privilege.tp,
-				Privilege.time,
-				Privilege.grantrevoke,
-				Privilege.root,
-				Privilege.commandplayer,};
-			}
-		}
-
-		public IPlayerRole Role {
-			get; private set;
-		}
-
-		public IServerPlayerData ServerData {
-			get {
-				throw new NotImplementedException( );
-			}
-		}
-
-		public EntityPos SpawnPosition {
-			get {
-				throw new NotImplementedException( );
-			}
-		}
-
-		public IWorldPlayerData WorldData {
-			get {
-				throw new NotImplementedException( );
-			}
-		}
-
-		public void BroadcastPlayerData( )
-		{
-			
-		}
-
-		public void ClearSpawnPosition( )
-		{
-			throw new NotImplementedException( );
-		}
-
-		public void Disconnect( )
-		{
-			throw new NotImplementedException( );
-		}
-
-		public void Disconnect(string message)
-		{
-			throw new NotImplementedException( );
-		}
-
-		public PlayerGroupMembership GetGroup(int groupId)
-		{
-		throw new NotImplementedException( );
-		}
-
-		public PlayerGroupMembership[ ] GetGroups( )
-		{
-		throw new NotImplementedException( );
-		}
-
-		public bool HasPrivilege(string privilegeCode)
-		{
-			return true;//Robot can do anything
-		}
-
-		public void SendIngameError(string code, string message = null, params object[] langparams)
-		{
-			
-		}
-
-		public void SendMessage(int groupId, string message, EnumChatType chatType, string data = null)
-		{
-			Logger.Chat("®TURK: «{0}»",message);
-		}
-
-		public void SendPositionToClient( )
-		{
-			throw new NotImplementedException( );
-		}
-
-		public void SetSpawnPosition(PlayerSpawnPos pos)
-		{
-			throw new NotImplementedException( );
-		}
-	}
-}
-

--- a/AdminToolkit/modinfo.json
+++ b/AdminToolkit/modinfo.json
@@ -3,7 +3,7 @@
   "name": "Administrator's Toolkit mod",
   "description" : "Provides misc. Admin functions;\n list admins, print & accept rules (multi-lingual) , auto-backup...",
   "authors": ["Melchior", ],
-  "version": "0.3.3",
+  "version": "0.3.4",
   "dependencies": { 
 	"game": "1.11.0"	
   },