提交: a5cd9edb6a7d9b0acd4bb4ba4a4f13047cbefb8e - carboncopy (git)

Carbon Copy plugin for VS

Commit MetaInfo

• 修訂: a5cd9edb6a7d9b0acd4bb4ba4a4f13047cbefb8e (tree)
• 時間: 2020-12-25 09:54:27
• 作者: melchior <melchior@user...>
• Commiter: melchior

Log Message

Improved Block/Item export command(s) - domain aware

Change Summary

• modified: CarbonCopy/ClientCommands/CarbonCopyCommand.cs
• modified: CarbonCopy/modinfo.json

差異

--- a/CarbonCopy/ClientCommands/CarbonCopyCommand.cs
+++ b/CarbonCopy/ClientCommands/CarbonCopyCommand.cs
@@ -8,6 +8,7 @@ using Vintagestory.API.Common;
 using Vintagestory.API.Config;
 using Vintagestory.API.MathTools;
 
+
 namespace CarbonCopy
 {
 	public class CarbonCopyCommand : ClientChatCommand
@@ -25,12 +26,21 @@ namespace CarbonCopy
 		private List<BlockPos> markedBlocks = new List<BlockPos>( );
 		private List<int> colorList = new List<int> { ColorUtil.ToRgba(180, 0, 195, 0) };
 
+		internal ModInfo InternalVersion
+		{
+			get
+			{
+				var gameMod = ClientAPI.ModLoader.GetMod(@"survival");//TODO: Figure out which; Creative / Survival ?
+			return gameMod.Info;
+			}
+		}
+
 
 		public CarbonCopyCommand(ICoreClientAPI clientAPI)
 		{		
 		this.Command = _name;
-		this.Syntax = @"mark: start/end/ (x/y/z), save [name], clear; dump {items/blocks}";
-		this.Description = "Export carbon-copies of block selections locally.(as json export schematic)";
+		this.Syntax = @"mark: start/end/ (x/y/z), save [name], clear; dump [items/blocks] [domain?]";
+		this.Description = @"Export carbon-copies of block selections locally.(as json export schematic) - also Block info...";
 
 		ClientAPI = clientAPI;
 		Logger = clientAPI.Logger;
@@ -75,7 +85,13 @@ namespace CarbonCopy
 
 		case "dump":
 			string ofType = args.PopWord("blocks");
-			if (ofType == "items") { Dump_ItemList( ); } else { Dump_BlockList( ); }			
+			string domainFilter = null;
+			if (args.Length == 1) 
+			{
+			domainFilter = args.PopWord( );
+			}
+
+			if (ofType == "items") { Dump_ItemList(domainFilter); } else { Dump_BlockList(domainFilter); }			
 			break;
 
 		default:
@@ -225,18 +241,29 @@ namespace CarbonCopy
 		ClientAPI.ShowChatMessage("Mark(s) Cleared.");
 		}
 
-		private void Dump_BlockList( )
+		private void Dump_BlockList(string domainFilter )
 		{
-		var filename = Path.Combine(ClientAPI.GetOrCreateDataPath(_exportPath), "vs_block_list_export_" + GameVersion.OverallVersion + ".tsv");
+		var filename = Path.Combine(ClientAPI.GetOrCreateDataPath(_exportPath), "vs_block_list_export_" + InternalVersion.Version + ".tsv");
+
+		IEnumerable<Block> bQuery;
+		if (string.IsNullOrWhiteSpace(domainFilter)) {
+		bQuery = ClientAPI.World.Blocks.Where(blk => blk.Code != null);
+		}
+		else {
+		bQuery = ClientAPI.World.Blocks.Where(blk => blk.Code != null && blk.Code.Domain.Equals(domainFilter, StringComparison.OrdinalIgnoreCase));
+		filename = Path.Combine(ClientAPI.GetOrCreateDataPath(_exportPath), "vs_block_list_export_" + InternalVersion.Version+ "_["+domainFilter +"]" + ".tsv");
+		}
 
 		using (StreamWriter reporter = new StreamWriter(filename, false)) {
 
-		reporter.WriteLine("MC Block Name\tVS Block Name\tVS ID#\tMaterial\t");
+		reporter.WriteLine("MC Block Name\tVS Block Name\tVS ID#\tDomain\tMaterial\t");
 		Logger.VerboseDebug("Dumping {0} Blocks", ClientAPI.World.Blocks.Count);
-		foreach (var block in ClientAPI.World.Blocks.Where(blk => blk.Code != null && blk.Code.Domain == GlobalConstants.DefaultDomain)) {
-		if (block.Id != 0 && !block.IsMissing && block.Code.Path != "unknown" ) {
-		reporter.WriteLine($"____\t{block.Code.Path}\t{block.BlockId}\t{block.BlockMaterial}");
 
+		
+
+		foreach (var block in bQuery) {
+		if (block.Id != 0 && !block.IsMissing && block.Code.Path != "unknown" ) {
+		reporter.WriteLine($"____\t{block.Code.Path}\t{block.BlockId}\t{block.Code.Domain}\t{block.BlockMaterial}");
 		}
 
 		}
@@ -244,20 +271,32 @@ namespace CarbonCopy
 		reporter.Flush( );
 		}
 
-		ClientAPI.ShowChatMessage("Created Block List....");
+		ClientAPI.ShowChatMessage("Created Blocks List....");
 		}
 
-		private void Dump_ItemList( )
+		private void Dump_ItemList(string domainFilter )
 		{
-		var filename = Path.Combine(ClientAPI.GetOrCreateDataPath(_exportPath), "vs_item_list_export_" + GameVersion.OverallVersion + ".tsv");
+		var filename = Path.Combine(ClientAPI.GetOrCreateDataPath(_exportPath), "vs_item_list_export_" + InternalVersion.Version + ".tsv");
+
+		IEnumerable<Item> iQuery;
+		if (string.IsNullOrWhiteSpace(domainFilter)) {
+		iQuery = ClientAPI.World.Items.Where(itm => itm.Code != null);
+		}
+		else {
+		iQuery = ClientAPI.World.Items.Where(itm => itm.Code != null && itm.Code.Domain.Equals(domainFilter, StringComparison.OrdinalIgnoreCase));
+		filename = Path.Combine(ClientAPI.GetOrCreateDataPath(_exportPath), "vs_item_list_export_" + InternalVersion.Version + "_[" + domainFilter + "]" + ".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");
+		reporter.WriteLine("MC Item Name\tVS Item Name\tVS ID#\tDomain\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.Where(itm => itm.Code != null && itm.Code.Domain == GlobalConstants.DefaultDomain)) {
+
+		
+
+		foreach (var item in iQuery ) {
 		if (item.Id != 0 && !item.IsMissing && item.Code.Path != "unknown") {
-		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.WriteLine($"____\t{item.Code.Path}\t{item.ItemId}\t{item.Code.Domain}\t{String.Join(",", item.StorageFlags)}\t{item.MaxStackSize}\t{(item.CreativeInventoryTabs != null ? String.Join(",",item.CreativeInventoryTabs): " ")}");
 		}
 
 		}

--- a/CarbonCopy/modinfo.json
+++ b/CarbonCopy/modinfo.json
@@ -1,14 +1,12 @@
 {
   "type": "code",
   "name": "Carbon-Copy",
-  "description" : "Export schematics from MP (clientside!)",
+  "description" : "Export schematics, and more from SP/MP (clientside!)",
   "authors": ["Melchior"],
-  "version": "0.1.5",
+  "version": "0.1.6",
   "side": "client",
   "dependencies": { 
 	"game": "1.13.0"	
   },
   "website": "http://nowebsite.nope"
-}
-
-
+}
\ No newline at end of file