提交: 86d1411ba92f0116f2dd57ab46892518934e7a2a - carboncopy (git)

Carbon Copy plugin for VS

Commit MetaInfo

• 修訂: 86d1411ba92f0116f2dd57ab46892518934e7a2a (tree)
• 時間: 2020-04-17 06:48:12
• 作者: melchior <melchior@user...>
• Commiter: melchior

Log Message

Version update; items export list V0.1.4

Change Summary

• modified: CarbonCopy/CarbonCopy.csproj
• modified: CarbonCopy/CarbonCopyMod.cs
• add: CarbonCopy/ClientCommands/CarbonCopyCommand.cs
• modified: CarbonCopy/modinfo.json

差異

--- a/CarbonCopy/CarbonCopy.csproj
+++ b/CarbonCopy/CarbonCopy.csproj
@@ -60,9 +60,11 @@
   <ItemGroup>
     <Compile Include="CarbonCopyMod.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="ClientCommands\CarbonCopyCommand.cs" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="VS_Libs\" />
+    <Folder Include="ClientCommands\" />
   </ItemGroup>
   <ItemGroup>
     <None Include="modinfo.json">

--- a/CarbonCopy/CarbonCopyMod.cs
+++ b/CarbonCopy/CarbonCopyMod.cs
@@ -1,7 +1,7 @@
 using System;
-
 using System.Collections.Generic;
 using System.IO;
+
 using Vintagestory.API.Client;
 using Vintagestory.API.Common;
 using Vintagestory.API.Common.Entities;
@@ -9,256 +9,35 @@ using Vintagestory.API.Config;
 using Vintagestory.API.MathTools;
 using Vintagestory.API.Server;
 
-namespace VCMiscMods
+namespace CarbonCopy
 {
 	public class CarbonCopyMod : ModSystem
 	{
-		private const int _highlightSlot = 42;
-		private const string _exportPath = @"Exports";
 
 		private ICoreAPI API { get; set; }
 		private ICoreServerAPI ServerAPI { get; set; }
 		private ICoreClientAPI ClientAPI { get; set; }
 
-		private BlockPos start;
-		private BlockPos end;
-		private bool validSelection;
-		private List<BlockPos> markedBlocks;
-		private List<int> colorList;
 
-		public CarbonCopyMod()
-		{
-			this.markedBlocks = new List<BlockPos>( );
-			this.colorList = new List<int> { ColorUtil.ToRgba(180, 0, 195, 0) };
-		}
 
 		public override bool ShouldLoad(EnumAppSide forSide)
 		{
-			return forSide.IsClient();
+		return forSide.IsClient( );
 		}
 
 		public override void StartClientSide(ICoreClientAPI api)
-		{			
-			this.API = api;
-			this.ClientAPI = api as ICoreClientAPI;
-
-			if (api.Side == EnumAppSide.Client) {
-				
-				ClientAPI.RegisterCommand("export", "Export Carbon copies of selections locally.", "mark: start/end/ (x/y/z), save [name], clear", CarbonCopyCommand);
-				Mod.Logger.Notification("Registered Carbon Copy command (export)");
-
-			}
-
-			base.StartClientSide(api);
-		}
-
-		/* .export 
-		 * mark
-		 * mark start
-		 * mark end
-		 * mark start x+1
-		 * mark end y-1
-		 * mark start z+20
-		 * mark clear
-		 * save {NAME}
-		 * 
-		 *
-		 */
-
-		private void CarbonCopyCommand(int groupId, CmdArgs args)
-		{
-			if (args.Length > 0) {
-				string command = args.PopWord( );
-
-				switch (command) {
-
-				case "mark":
-
-					Process_MarkSubcommand(args);
-
-					break;
-
-				case "save":
-					if (validSelection) {
-						var filename = args.PopWord("export_" + Math.Round(DateTime.UtcNow.TimeOfDay.TotalSeconds));
-						Process_SaveCommand(filename);
-					}
-					break;
-
-				case "clear":
-					Process_ClearCommand( );
-					break;
-
-				case "dumpblocklist":
-					Dump_BlockList( );
-				break;
-
-				default:
-					ClientAPI.ShowChatMessage("Wrong argument? mark/save/clear");
-					break;
-				}
-			} else {
-				ClientAPI.ShowChatMessage("Need arguments; must be: mark/save/clear");
-			}
-		}
-
-		private void Process_MarkSubcommand(CmdArgs args )
-		{
-		if (args.Length > 0) {
-		string subCommand = args.PopWord( ).ToLowerInvariant( );
-
-
-		switch (subCommand) {
-		case "start":
-			if (this.start == null) {
-			this.start = ClientAPI.World.Player.Entity.LocalPos.AsBlockPos.Copy( );
-			}
-			BendBlockPosition(this.start, args);
-
-			ClientAPI.ShowChatMessage(string.Format("Marked start; ({0}).", start));
-			break;
-
-		case "end":
-			if (this.end == null) {
-			this.end = ClientAPI.World.Player.Entity.LocalPos.AsBlockPos.Copy( );
-			}
-			BendBlockPosition(this.end, args);
-
-			ClientAPI.ShowChatMessage(string.Format("Marked end; ({0}).", end));
-			break;
-
-		default:
-			ClientAPI.ShowChatMessage("Mark: start or end ?");
-			break;
-		}
-
-		this.validSelection = false;
-
-		if (this.start != null &&
-		this.end != null &&
-		ClientAPI.World.BulkBlockAccessor.IsValidPos(this.start) &&
-		ClientAPI.World.BulkBlockAccessor.IsValidPos(this.end)
-		   ) {
-
-		//Calc. Vol:
-		var size = start.DistanceTo(end);
-
-		if (size > 1) {
-
-		this.validSelection = true;
-
-		this.markedBlocks.Clear( );
-
-		ClientAPI.World.BulkBlockAccessor.WalkBlocks(start, end, addToMarked);
-
-		ClientAPI.World.HighlightBlocks(ClientAPI.World.Player, _highlightSlot, this.markedBlocks, colorList, EnumHighlightBlocksMode.Absolute, EnumHighlightShape.Arbitrary);
-
-		ClientAPI.ShowChatMessage(string.Format("Marked area: {0:f1}diag = {1} blocks", size, markedBlocks.Count));
-		}
-		else {
-		ClientAPI.ShowChatMessage("Marked area: volume too small"); ;
-		}
-		}
-		}
-		else {
-			ClientAPI.ShowChatMessage("Mark: start / end (x,y,z +-1#)");	
-		}
-
-		}
-
-		private void BendBlockPosition(BlockPos position, CmdArgs args)
-		{
-			char? axis = args.PopChar( );
-			int? offset = args.PopInt( );
-
-			if (axis.HasValue && offset.HasValue) {
-				switch (Char.ToLowerInvariant(axis.Value)) {
-				
-				case 'x':
-					ClientAPI.ShowChatMessage(string.Format("applied X offset {0},", offset.Value));
-					position.Add(dx:offset.Value, dy:0, dz:0);
-				break;
-
-				case 'y':
-					ClientAPI.ShowChatMessage(string.Format("applied Y offset {0},", offset.Value));
-					position.Add(dx:0, dy:offset.Value, dz:0);
-					break;
-
-				case 'z':
-					ClientAPI.ShowChatMessage(string.Format("applied Z offset {0},", offset.Value));
-					position.Add(dx:0, dy:0, dz:offset.Value);
-					break;
-
-				default:
-					//Nothing to do.
-					break;
-				}}
-		}
-
-		private void addToMarked(Block aBlock, BlockPos aPos)
-		{			
-			this.markedBlocks.Add(aPos.Copy());
-		}
-
-		private void Process_SaveCommand(string filename)
-		{
-			if (validSelection) {
-
-				BlockSchematic blockExport = new BlockSchematic( );
-
-				blockExport.Init(ClientAPI.World.BlockAccessor);
-
-				blockExport.AddArea(ClientAPI.World, this.start, this.end);
-
-				if (blockExport.Pack(ClientAPI.World, this.start))//What should start Be?
-				{
-					ClientAPI.ShowChatMessage(string.Format("Export packed OK: {0} Blocks {1} Entities {2} BlockEntity", blockExport.BlockIds.Count, blockExport.Entities.Count, blockExport.BlockEntities.Count));
-
-					filename = Path.Combine(ClientAPI.GetOrCreateDataPath(_exportPath), filename);
-
-					blockExport.Save(filename);
-
-					Process_ClearCommand( );
-				} else {
-					ClientAPI.ShowChatMessage("Error; can't pack for export...");
-				}
-			}
-		}
-
-
-		private void Process_ClearCommand( )
 		{
-			this.start = null;
-			this.end = null;
-			this.validSelection = false;
-			this.markedBlocks.Clear( );
-			ClientAPI.World.HighlightBlocks(ClientAPI.World.Player, _highlightSlot, this.markedBlocks,  EnumHighlightBlocksMode.Absolute, EnumHighlightShape.Arbitrary);
+		this.API = api;
+		this.ClientAPI = api as ICoreClientAPI;
 
-			ClientAPI.ShowChatMessage("Mark(s) Cleared.");
-		}
-
-		private void Dump_BlockList( )
-		{
-		var filename = Path.Combine(ClientAPI.GetOrCreateDataPath(_exportPath), "vs_block_list_export_" + GameVersion.OverallVersion + ".tsv");
-
-		using (StreamWriter reporter = new StreamWriter(filename)) {
-
-		reporter.WriteLine("MC Block Name\tVS Block Name\tVS ID#\tMaterial\t");
-
-		foreach (var block in ClientAPI.World.Blocks) {
-		if (block.Id != 0 && !block.IsMissing && block.Code.Domain == GlobalConstants.DefaultDomain) {
-		reporter.WriteLine($"<FILL>\t{block.Code.Path}\t{block.BlockId}\t{block.BlockMaterial}");
+		if (api.Side == EnumAppSide.Client) {
 
+		ClientAPI.RegisterCommand(new CarbonCopyCommand(ClientAPI));
+		Mod.Logger.Notification("Registered Carbon Copy command (export)");
 		}
 
+		base.StartClientSide(api);
 		}
-
-		reporter.Flush( );
-		}
-		
-		ClientAPI.ShowChatMessage("Created Block List....");
-		}
-
 	}
 }
 

--- /dev/null
+++ b/CarbonCopy/ClientCommands/CarbonCopyCommand.cs
@@ -0,0 +1,278 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+
+using Vintagestory.API.Client;
+using Vintagestory.API.Common;
+using Vintagestory.API.Config;
+using Vintagestory.API.MathTools;
+
+namespace CarbonCopy
+{
+	public class CarbonCopyCommand : ClientChatCommand
+	{
+		private const int _highlightSlot = 42;
+		private const string _exportPath = @"Exports";
+		private const string _name = @"export";
+
+		private ICoreClientAPI ClientAPI { get; set; }
+		private ILogger Logger { get; set; }
+
+		private BlockPos start;
+		private BlockPos end;
+		private bool validSelection;
+		private List<BlockPos> markedBlocks;
+		private List<int> colorList;
+
+		public CarbonCopyCommand( )
+		{
+		this.markedBlocks = new List<BlockPos>( );
+		this.colorList = new List<int> { ColorUtil.ToRgba(180, 0, 195, 0) };
+		}
+
+		public CarbonCopyCommand(ICoreClientAPI clientAPI)
+		{
+		this.Command = _name;
+		this.Syntax = @"mark: start/end/ (x/y/z), save [name], clear; dump {items/blocks}";
+		this.Description = "Export crbon-copies of block selections locally.(as 'mex' file)";
+
+		ClientAPI = clientAPI;
+		Logger = clientAPI.Logger;
+		}
+
+
+
+		/* .export 
+		 * mark
+		 * mark start
+		 * mark end
+		 * mark start x+1
+		 * mark end y-1
+		 * mark start z+20
+		 * mark clear
+		 * save {NAME}
+		 * 
+		 *
+		 */
+
+		public override void CallHandler(IPlayer player, int groupId, CmdArgs args)
+		{
+		if (args.Length > 0) {
+		string command = args.PopWord( );
+
+		switch (command) {
+
+		case "mark":
+
+			Process_MarkSubcommand(args);
+
+			break;
+
+		case "save":
+			if (validSelection) {
+			var filename = args.PopWord("export_" + Math.Round(DateTime.UtcNow.TimeOfDay.TotalSeconds));
+			Process_SaveCommand(filename);
+			}
+			break;
+
+		case "clear":
+			Process_ClearCommand( );
+			break;
+
+		case "dump":
+			string ofType = args.PopWord("blocks");
+			if (ofType == "items") { Dump_ItemList( ); } else { Dump_BlockList( ); }			
+			break;
+
+		default:
+			ClientAPI.ShowChatMessage("Unrecognised argument...");
+			break;
+		}
+		}
+		else {
+		ClientAPI.ShowChatMessage("Needs a command: mark/save/clear/dump");
+		}
+		}
+
+		private void Process_MarkSubcommand(CmdArgs args)
+		{
+		if (args.Length > 0) {
+		string subCommand = args.PopWord( ).ToLowerInvariant( );
+
+
+		switch (subCommand) {
+		case "start":
+			if (this.start == null) {
+			this.start = ClientAPI.World.Player.Entity.LocalPos.AsBlockPos.Copy( );
+			}
+			BendBlockPosition(this.start, args);
+
+			ClientAPI.ShowChatMessage(string.Format("Marked start; ({0}).", start));
+			break;
+
+		case "end":
+			if (this.end == null) {
+			this.end = ClientAPI.World.Player.Entity.LocalPos.AsBlockPos.Copy( );
+			}
+			BendBlockPosition(this.end, args);
+
+			ClientAPI.ShowChatMessage(string.Format("Marked end; ({0}).", end));
+			break;
+
+		default:
+			ClientAPI.ShowChatMessage("Mark: start or end ?");
+			break;
+		}
+
+		this.validSelection = false;
+
+		if (this.start != null &&
+		this.end != null &&
+		ClientAPI.World.BulkBlockAccessor.IsValidPos(this.start) &&
+		ClientAPI.World.BulkBlockAccessor.IsValidPos(this.end)
+		   ) {
+
+		//Calc. Vol:
+		var size = start.DistanceTo(end);
+
+		if (size > 1) {
+
+		this.validSelection = true;
+
+		this.markedBlocks.Clear( );
+
+		ClientAPI.World.BulkBlockAccessor.WalkBlocks(start, end, addToMarked);
+
+		ClientAPI.World.HighlightBlocks(ClientAPI.World.Player, _highlightSlot, this.markedBlocks, colorList, EnumHighlightBlocksMode.Absolute, EnumHighlightShape.Arbitrary);
+
+		ClientAPI.ShowChatMessage(string.Format("Marked area: {0:f1}diag = {1} blocks", size, markedBlocks.Count));
+		}
+		else {
+		ClientAPI.ShowChatMessage("Marked area: volume too small"); ;
+		}
+		}
+		}
+		else {
+		ClientAPI.ShowChatMessage("Mark: start / end (x,y,z +-1#)");
+		}
+
+		}
+
+		private void BendBlockPosition(BlockPos position, CmdArgs args)
+		{
+		char? axis = args.PopChar( );
+		int? offset = args.PopInt( );
+
+		if (axis.HasValue && offset.HasValue) {
+		switch (Char.ToLowerInvariant(axis.Value)) {
+
+		case 'x':
+			ClientAPI.ShowChatMessage(string.Format("applied X offset {0},", offset.Value));
+			position.Add(dx: offset.Value, dy: 0, dz: 0);
+			break;
+
+		case 'y':
+			ClientAPI.ShowChatMessage(string.Format("applied Y offset {0},", offset.Value));
+			position.Add(dx: 0, dy: offset.Value, dz: 0);
+			break;
+
+		case 'z':
+			ClientAPI.ShowChatMessage(string.Format("applied Z offset {0},", offset.Value));
+			position.Add(dx: 0, dy: 0, dz: offset.Value);
+			break;
+
+		default:
+			//Nothing to do.
+			break;
+		}
+		}
+		}
+
+		private void addToMarked(Block aBlock, BlockPos aPos)
+		{
+		this.markedBlocks.Add(aPos.Copy( ));
+		}
+
+		private void Process_SaveCommand(string filename)
+		{
+		if (validSelection) {
+
+		BlockSchematic blockExport = new BlockSchematic( );
+
+		blockExport.Init(ClientAPI.World.BlockAccessor);
+
+		blockExport.AddArea(ClientAPI.World, this.start, this.end);
+
+		if (blockExport.Pack(ClientAPI.World, this.start))//What should start Be?
+		{
+		ClientAPI.ShowChatMessage(string.Format("Export packed OK: {0} Blocks {1} Entities {2} BlockEntity", blockExport.BlockIds.Count, blockExport.Entities.Count, blockExport.BlockEntities.Count));
+
+		filename = Path.Combine(ClientAPI.GetOrCreateDataPath(_exportPath), filename);
+
+		blockExport.Save(filename);
+
+		Process_ClearCommand( );
+		}
+		else {
+		ClientAPI.ShowChatMessage("Error; can't pack for export...");
+		}
+		}
+		}
+
+
+		private void Process_ClearCommand( )
+		{
+		this.start = null;
+		this.end = null;
+		this.validSelection = false;
+		this.markedBlocks.Clear( );
+		ClientAPI.World.HighlightBlocks(ClientAPI.World.Player, _highlightSlot, this.markedBlocks, EnumHighlightBlocksMode.Absolute, EnumHighlightShape.Arbitrary);
+
+		ClientAPI.ShowChatMessage("Mark(s) Cleared.");
+		}
+
+		private void Dump_BlockList( )
+		{
+		var filename = Path.Combine(ClientAPI.GetOrCreateDataPath(_exportPath), "vs_block_list_export_" + GameVersion.OverallVersion + ".tsv");
+
+		using (StreamWriter reporter = new StreamWriter(filename, false)) {
+
+		reporter.WriteLine("MC Block Name\tVS Block Name\tVS ID#\tMaterial\t");
+		Logger.VerboseDebug("Dumping {0} Blocks", ClientAPI.World.Blocks.Count);
+		foreach (var block in ClientAPI.World.Blocks.FindAll(blk => blk.Code != null && blk.Code.Domain == GlobalConstants.DefaultDomain)) {
+		if (block.Id != 0 && !block.IsMissing ) {
+		reporter.WriteLine($"____\t{block.Code.Path}\t{block.BlockId}\t{block.BlockMaterial}");
+
+		}
+
+		}
+
+		reporter.Flush( );
+		}
+
+		ClientAPI.ShowChatMessage("Created Block List....");
+		}
+
+		private void Dump_ItemList( )
+		{
+		var filename = Path.Combine(ClientAPI.GetOrCreateDataPath(_exportPath), "vs_item_list_export_" + GameVersion.OverallVersion + ".tsv");
+
+		using (StreamWriter reporter = new StreamWriter(filename, false)) {
+
+		reporter.WriteLine("MC Item Name\tVS Item Name\tVS ID#\tStorage Flags\tMax Stack Size\tC.I. Tabs\t");
+		Logger.VerboseDebug("Dumping {0} Items", ClientAPI.World.Items.Count);
+		foreach (var item in ClientAPI.World.Items.FindAll(itm => itm.Code != null && itm.Code.Domain == GlobalConstants.DefaultDomain)) {
+		if (item.Id != 0 && !item.IsMissing) {
+		reporter.WriteLine($"____\t{item.Code.Path}\t{item.ItemId}\t{String.Join(",", item.StorageFlags)}\t{item.MaxStackSize}\t{(item.CreativeInventoryTabs != null ? String.Join(",",item.CreativeInventoryTabs): " ")}");
+		}
+
+		}
+
+		reporter.Flush( );
+		}
+
+		ClientAPI.ShowChatMessage("Created Items List....");
+		}
+	}
+}
+

--- a/CarbonCopy/modinfo.json
+++ b/CarbonCopy/modinfo.json
@@ -3,7 +3,7 @@
   "name": "Carbon-Copy",
   "description" : "Export schematics from MP (clientside!)",
   "authors": ["Melchior"],
-  "version": "0.1.3",
+  "version": "0.1.4",
   "side": "client",
   "dependencies": { 
 	"game": "1.11.0"