提交: bec2800391ac01e3d6733b621e4e1e566042786a - adjustor (git)

Adjustor mod plugin for VS

Commit MetaInfo

• 修订版: bec2800391ac01e3d6733b621e4e1e566042786a (tree)
• 时间: 2021-01-09 08:48:12
• 作者: melchior <melchior@user...>
• Commiter: melchior

Log Message

W.I.P. Chute support 1/3

更改概述

• modified: AdjustorMod/Items/ItemAdjustor.cs

差异

--- a/AdjustorMod/Items/ItemAdjustor.cs
+++ b/AdjustorMod/Items/ItemAdjustor.cs
@@ -27,11 +27,15 @@ namespace AdjustorMod
 		private const string _meshAngleKey = @"MeshAngle";
 		private const string _toolMode = @"toolMode";
 		private const string _sideKey = @"side";
+
 		private const string _rotKey = @"rot";//Slabs use this key instead....
 		private const string _axialRotationKey = @"rotation";//Trees and Pillars; ns, we, ud - axial rotation
+		private const string _chuteCode = @"chute";//Just for Chutes...
+		private const string _verticalCode = @"vertical";
 
 		private static string _simpleCoatingClass = @"BlockSimpleCoating";//Similar to slabs...
 
+
 		private static string[] _cardinalCodes = new string[]
 		{
 			@"north",
@@ -48,10 +52,14 @@ namespace AdjustorMod
 
 		private static string[] _axialRotationCodes = new string[]
 		{			
-			//tree logs, and tree log-like things; pillars, axles....;
+			//tree logs, and tree log-like things; pillars, axles, some chutes....;
 			@"ud",
 			@"ns",
-			@"we"
+			@"we",
+			@"ud-n", 
+			@"ud-e", 
+			@"ud-s", 
+			@"ud-w"
 		};
 
 		private static string[] _blacklistedClasses = new string[]
@@ -194,7 +202,8 @@ namespace AdjustorMod
 				var meshSpin = RotatableByAngledMeshEntity(thatBlock, position);
 
 				if (meshSpin) {
-					madeAdjustment = MeshRotation(this.CurrentRotationMode(slot), thePlayer, thatBlock, position);
+					madeAdjustment = true;
+					MeshRotation(this.CurrentRotationMode(slot), thePlayer, thatBlock, position);
 				}
 				else if (this.CurrentRotationMode(slot) == RotationModes.Free) {
 				madeAdjustment = FreeRotation(blockSel, byEntity, thePlayer, thatBlock, position);
@@ -481,8 +490,8 @@ namespace AdjustorMod
 		{
 			string oppositeDirection = string.Empty;
 
-			//wood Log by: ns / we - change to opposite
-			string directionName = thatBlock.Variant[_axialRotationKey];
+			//Axial block: ud / ns / we - change to opposite
+			string directionName = thatBlock.Variant[_axialRotationKey] ?? thatBlock.Variant[_sideKey];
 			if (axisNormal) {
 				switch (directionName) {
 				case @"ud":
@@ -515,15 +524,71 @@ namespace AdjustorMod
 		}
 
 		/// <summary>
-		/// Is this a axial type thing / wood log?
+		/// Custom Block variant Determinator - as Chutes are...."SPECIAL"
+		/// </summary>
+		/// <returns>The specific flip.</returns>
+		/// <param name="thatBlock">That block.</param>
+		/// <param name="axis">Axis.</param>
+		/// <param name="rotateHorizontal">Rotate horizontal.</param>
+		private AssetLocation ChuteSpecificFlip(Block thatBlock, EnumAxis axis, bool rotateHorizontal)
+		{
+		/*Is: ?
+		{ code: "vertical", states: ["up", "down" ] },
+		>> NEWS-UD
+		//////////// Otherwise:
+		{ code: "side", states: ["ns", "we", "ud-n", "ud-e", "ud-s", "ud-w"] } << t
+		{ code: "side", states: ["ns", "we", "ground"] } << cross
+		{ code: "side", states: ["ns", "we", "ud"] } <<  straight
+		*/
+		AssetLocation translatedCode = null;
+
+		if (thatBlock.Variant.ContainsKey(_verticalCode)) 
+		{
+		string vert = thatBlock.Variant[_verticalCode];
+		string side = thatBlock.Variant[_sideKey];
+
+		switch (axis) {
+		case EnumAxis.X:
+			if (side == "east") { translatedCode = thatBlock.CodeWithVariant(_verticalCode, "west"); }
+			else { translatedCode = thatBlock.CodeWithVariant(_verticalCode, "east"); }
+			break;
+
+		case EnumAxis.Y:
+			if (vert == "up") { translatedCode = thatBlock.CodeWithVariant(_verticalCode, "down"); }
+			else { translatedCode = thatBlock.CodeWithVariant(_verticalCode, "up"); }
+			break;
+
+		case EnumAxis.Z:
+			if (side == "north") { translatedCode = thatBlock.CodeWithVariant(_verticalCode, "south"); }
+			else { translatedCode = thatBlock.CodeWithVariant(_verticalCode, "north"); }
+			break;		
+		}
+
+		return translatedCode;
+		}
+
+		return null;
+		}
+
+		/// <summary>
+		/// Is this a axial type thing / wood log / chute?
 		/// </summary>
 		/// <returns>If its axial.</returns>
 		/// <param name="thatBlock">That block.</param>
 		private static bool IsAxialOriented(Block thatBlock)
 		{
-			return thatBlock.Variant.ContainsKey(_axialRotationKey);
+		if (thatBlock.Variant.ContainsKey(_axialRotationKey)) return true;
+
+		//Axial variants - vary...
+		if (_axialRotationCodes.Any(arc => arc == thatBlock.Variant[_sideKey])) return true;
+
+		return false;
 		}
 
+		private bool IsChute(Block thatBlock)
+		{			
+		return thatBlock.Code.BeginsWith(GlobalConstants.DefaultDomain, _chuteCode);
+		}
 
 
 
@@ -565,8 +630,15 @@ namespace AdjustorMod
 				}
 
 				if (IsAxialOriented(thatBlock)) {
-					
+
+					if (IsChute(thatBlock)) {
+						renamedAsset =	ChuteSpecificFlip(thatBlock, blockSel.Face.Axis, rotateHorizontal);
+					}
+					else {
 					renamedAsset = AxialOmniFlip(thatBlock, blockSel.Face.Axis, rotateHorizontal); //Wood logs also special
+					}
+
+
 					#if DEBUG
 					Logger.VerboseDebug("{0} Special Axial Case {1}", thatBlock.Code, renamedAsset);
 					#endif
@@ -645,7 +717,7 @@ namespace AdjustorMod
 
 				if (renamedAsset.Equals(thatBlock.Code) == false) {
 					#if DEBUG
-					Logger.VerboseDebug("{0} Forcing: {1}", thatBlock.Code, renamedAsset);
+					Logger.VerboseDebug("{0} Renamed: {1}", thatBlock.Code, renamedAsset);
 					#endif
 
 					var rotatedBlock = ServerApi.World.GetBlock(renamedAsset);
@@ -673,7 +745,7 @@ namespace AdjustorMod
 		/// <param name="thePlayer">The player.</param>
 		/// <param name="thatBlock">That block.</param>
 		/// <param name="position">Position.</param>
-		private bool MeshRotation(RotationModes rotationModes, IPlayer thePlayer, Block thatBlock, BlockPos position)
+		private void MeshRotation(RotationModes rotationModes, IPlayer thePlayer, Block thatBlock, BlockPos position)
 		{//Context: SERVER!
 		
 		dynamic subjectBE = ServerApi.World.BlockAccessor.GetBlockEntity(position);
@@ -705,8 +777,7 @@ namespace AdjustorMod
 		#endif
 
 		subjectBE.MarkDirty(true);		
-
-		return false;
+					
 		}
 
 		private AssetLocation RenameBlockFace(Block thatBlock, RotationModes rotationMode)