提交: 2bd43bf791833937d7ad584005508e3be5d5c9dd - carboncopy (git)

Carbon Copy plugin for VS

Commit MetaInfo

• 修訂: 2bd43bf791833937d7ad584005508e3be5d5c9dd (tree)
• 時間: 2021-11-10 07:36:38
• 作者: melchior <melchior@user...>
• Commiter: melchior

Log Message

select bugfix, msg improvements

Bugfix for Selection box, not matching exported area.
Somewhat improved command feedback messages.

Change Summary

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

差異

--- a/CarbonCopy/CarbonCopy.csproj
+++ b/CarbonCopy/CarbonCopy.csproj
@@ -20,7 +20,7 @@
     <ConsolePause>false</ConsolePause>
     <CustomCommands>
       <CustomCommands>
-        <Command type="AfterBuild" command="7z -tzip a Carboncopy_${ProjectConfig}.zip" workingdir="${TargetDir}" />
+        <Command type="AfterBuild" command="7z a -tzip -x!*.zip -aoa CarbonCopy_${ProjectConfig}.zip" workingdir="${TargetDir}" />
         <Command type="AfterClean" command="rm -f *.zip" workingdir="${TargetDir}" />
       </CustomCommands>
     </CustomCommands>

--- a/CarbonCopy/ClientCommands/CarbonCopyCommand.cs
+++ b/CarbonCopy/ClientCommands/CarbonCopyCommand.cs
@@ -39,7 +39,7 @@ namespace CarbonCopy
 		public CarbonCopyCommand(ICoreClientAPI clientAPI)
 		{		
 		this.Command = _name;
-		this.Syntax = @"mark: start/end/ (x/y/z), save [name], clear; dump [items/blocks] [domain?]";
+		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;
@@ -57,7 +57,7 @@ namespace CarbonCopy
 		 * mark start z+20
 		 * mark clear
 		 * save {NAME}
-		 * 
+		 * dump blocks/items
 		 *
 		 */
 
@@ -95,7 +95,7 @@ namespace CarbonCopy
 			break;
 
 		default:
-			ClientAPI.ShowChatMessage($"Unrecognised command: {command}");
+			ClientAPI.ShowChatMessage($"Unrecognised command: '{command}' - try 'mark/save/clear'...");
 			break;
 		}
 		}
@@ -117,7 +117,7 @@ namespace CarbonCopy
 			}
 			BendBlockPosition(this.start, args);
 
-			ClientAPI.ShowChatMessage(string.Format("Marked start; ({0}).", start));
+			ClientAPI.ShowChatMessage(string.Format("Start@ ({0}).", start));
 			break;
 
 		case "end":
@@ -126,11 +126,11 @@ namespace CarbonCopy
 			}
 			BendBlockPosition(this.end, args);
 
-			ClientAPI.ShowChatMessage(string.Format("Marked end; ({0}).", end));
+			ClientAPI.ShowChatMessage(string.Format("End@ ({0}).", end));
 			break;
 
 		default:
-			ClientAPI.ShowChatMessage("Mark: start or end ?");
+			ClientAPI.ShowChatMessage("Mark synax: start or end");
 			break;
 		}
 
@@ -138,61 +138,64 @@ namespace CarbonCopy
 
 		if (this.start != null &&
 		this.end != null &&
-		ClientAPI.World.BulkBlockAccessor.IsValidPos(this.start) &&
-		ClientAPI.World.BulkBlockAccessor.IsValidPos(this.end)
+		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));
+		int X = Math.Abs(start.X - end.X) + 1;
+		int Y = Math.Abs(start.Y - end.Y) + 1;
+		int Z = Math.Abs(start.Z - end.Z) + 1;
+
+		ClientAPI.ShowChatMessage($"Marked (X {X:#},Y {Y:#} ,Z {Z:#} ) {size:f1} diagonal = {markedBlocks.Count} cells");
 		}
 		else {
-		ClientAPI.ShowChatMessage("Marked area: volume too small"); ;
-		}
+		ClientAPI.ShowChatMessage("Marked area: volume too small");
 		}
+		}		
 		}
 		else {
-		ClientAPI.ShowChatMessage("Mark: start / end (x,y,z +-1#)");
+		ClientAPI.ShowChatMessage("(Needs args) Mark: start / end (x,y,z +-1#)");
 		}
 
 		}
 
 		private void BendBlockPosition(BlockPos position, CmdArgs args)
 		{
-		char? axis = args.PopChar( );
-		int? offset = args.PopInt( );
+		if (args.Length == 0) return;
+		char? axis = args.PopChar();
+		int? offset = args.PopInt();
 
-		if (axis.HasValue && offset.HasValue) {
+		if (axis.HasValue && offset.HasValue) {		
 		switch (Char.ToLowerInvariant(axis.Value)) {
 
-		case 'x':
-			ClientAPI.ShowChatMessage(string.Format("applied X offset {0},", offset.Value));
+		case 'x':			
 			position.Add(dx: offset.Value, dy: 0, dz: 0);
+			ClientAPI.ShowChatMessage(string.Format("altered {0}, offset {1}", axis.Value, offset.Value));
 			break;
 
-		case 'y':
-			ClientAPI.ShowChatMessage(string.Format("applied Y offset {0},", offset.Value));
+		case 'y':			
 			position.Add(dx: 0, dy: offset.Value, dz: 0);
+			ClientAPI.ShowChatMessage(string.Format("altered {0}, offset {1}", axis.Value, offset.Value));
 			break;
 
-		case 'z':
-			ClientAPI.ShowChatMessage(string.Format("applied Z offset {0},", offset.Value));
+		case 'z':			
 			position.Add(dx: 0, dy: 0, dz: offset.Value);
+			ClientAPI.ShowChatMessage(string.Format("altered {0}, offset {1}", axis.Value, offset.Value));
 			break;
 
 		default:
-			//Nothing to do.
+			ClientAPI.ShowChatMessage("Can't apply offset; not in \"x, y, z  +1#\" form...");
 			break;
 		}
 		}
@@ -206,16 +209,30 @@ namespace CarbonCopy
 		private void Process_SaveCommand(string filename)
 		{
 		if (validSelection) {
-
 		BlockSchematic blockExport = new BlockSchematic( );
+		//Random Start / End
 
-		blockExport.Init(ClientAPI.World.BlockAccessor);
+		//'Lower'-> South + Westmost corner of same volume
+		BlockPos seCorner = new BlockPos(Math.Max(start.X, end.X), Math.Min(start.Y, end.Y), Math.Max(start.Z, end.Z));
+		//'Upper'-> North + Eastmost corner of same volume		
+		BlockPos nwCorner = new BlockPos(Math.Min(start.X, end.X), Math.Max(start.Y, end.Y), Math.Min(start.Z, end.Z));
+
+		//diagonal 'left'; offset into 'upper' - adds corner
+		nwCorner.Up();
 
-		blockExport.AddArea(ClientAPI.World, this.start, this.end);
+		seCorner.X += 1;
+		seCorner.Z += 1;	
+
+		blockExport.Init(ClientAPI.World.BlockAccessor);
+		#if DEBUG
+		Logger.Debug("Start: {0}, End:{1}", start, end);				
+		Logger.Debug("S.E C: {0}, N.W:{1} (offset)", seCorner, nwCorner);
+		#endif
+		blockExport.AddArea(ClientAPI.World, seCorner, nwCorner);//Off by 1 in XYZ
 
-		if (blockExport.Pack(ClientAPI.World, this.start))//What should start Be?
+		if (blockExport.Pack(ClientAPI.World, seCorner))//?
 		{
-		ClientAPI.ShowChatMessage(string.Format("Export packed OK: {0} Blocks {1} Entities {2} BlockEntity", blockExport.BlockIds.Count, blockExport.Entities.Count, blockExport.BlockEntities.Count));
+		ClientAPI.ShowChatMessage(string.Format("Export packed OK: {0} BlockIDs, {1}, Entities, {2} BlockEntities; ({3} total blocks)", blockExport.BlockIds.Count, blockExport.Entities.Count, blockExport.BlockEntities.Count, blockExport.Indices.Count));
 
 		filename = Path.Combine(ClientAPI.GetOrCreateDataPath(_exportPath), filename);
 

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