Commit: b07f611646d72b52d8c2ab2c03f3b0df55f4c3f6 - adjustor (git)

Adjustor mod plugin for VS

Commit MetaInfo

• Revision: b07f611646d72b52d8c2ab2c03f3b0df55f4c3f6 (tree)
• Zeit: 2019-06-01 07:39:50
• Autor: melchior <melchior@user...>
• Commiter: melchior

Log Message

Fixed up Rotations from Variants
Tool mode text entries added

Ändern Zusammenfassung

• modified: AdjustorMod/ItemAdjustor.cs
• modified: AdjustorMod/assets/Adjustor/lang/en.json

Diff

--- a/AdjustorMod/ItemAdjustor.cs
+++ b/AdjustorMod/ItemAdjustor.cs
@@ -4,7 +4,7 @@ using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
-//using System.Text.RegularExpressions;
+using System.Text.RegularExpressions;
 
 using Vintagestory.API.Common;
 using Vintagestory.API.Datastructures;
@@ -60,6 +60,19 @@ namespace Adjustor
 			@"GenericTypedContainer",
 		};
 
+		private static string[] _verticalVariantKeys = new string[]
+		{
+			"verticalorientation",
+			"rot",
+		};
+
+		private static string[] _horizontalVariantKeys = new string[]
+		{
+			"horizontalorientation",
+			"rot",
+			"side"
+		};
+
 		public ItemAdjustor( ) : base( )
 		{
 			
@@ -96,15 +109,7 @@ namespace Adjustor
 		/// <param name="entitySel">Entity sel.</param>
 		/// <param name="handHandling">Hand handling.</param>
 		public override void OnHeldInteractStart(ItemSlot itemslot, EntityAgent byEntity, BlockSelection blockSel, EntitySelection entitySel, bool firstEvent, ref EnumHandHandling handHandling)
-		{
-			/*
-			if ( entitySel != null ) {
-				#if DEBUG
-				ClientApi.ShowChatMessage( string.Format("Got an Entity Selection: {0} - {1}", entitySel.Entity.Code.ToShortString(), entitySel.Face.Code ) );
-				#endif
-			}
-			*/
-
+		{			
 			if (blockSel == null) {
 				return;
 			}
@@ -153,7 +158,7 @@ namespace Adjustor
 				BlockPos position = blockSel.Position;
 				Block thatBlock = byEntity.World.BlockAccessor.GetBlock(position);
 				IPlayer thePlayer = null;
-				bool rotateHorizontal = false;
+
 
 				if (byEntity is EntityPlayer) {
 					thePlayer = ServerApi.World.PlayerByUid((( EntityPlayer )byEntity).PlayerUID);
@@ -170,88 +175,12 @@ namespace Adjustor
 					return false;
 				}
 
-				AssetLocation renamedAsset = null;
-
-				switch (blockSel.Face.Axis) {
-				case EnumAxis.X:
-				case EnumAxis.Z:
-					rotateHorizontal = !byEntity.Controls.Sneak;
-					break;
-
-				case EnumAxis.Y:
-					rotateHorizontal = byEntity.Controls.Sneak;
-					break;
-				}
-
-				if (rotateHorizontal) {
-#if DEBUG
-					ServerApi.SendMessage(thePlayer, GlobalConstants.CurrentChatGroup, "Angle N/E/W/S.", EnumChatType.Notification);
-#endif
-
-					//So many HORIZONTAL Special Cases...
-					renamedAsset = thatBlock.GetRotatedBlockCode(90);//Except Fences 
-
-					if (IsSlabUD(thatBlock)) renamedAsset = SpecialSlabHorizontalFlipCase(thatBlock);
-
-					if (IsWoodLog(thatBlock)) renamedAsset = WoodOmniFlip(thatBlock, blockSel.Face.Axis, rotateHorizontal); //Wood logs also special
-
-
-					if (renamedAsset != thatBlock.Code) {
-#if DEBUG
-						Logger.VerboseDebug("{0} Becomes {1}", thatBlock.Code, renamedAsset);
-#endif
-
-						var rotatedBlock = ServerApi.World.GetBlock(renamedAsset);
-						if (rotatedBlock != null) {
-							ServerApi.World.BlockAccessor.ExchangeBlock(rotatedBlock.BlockId, position);
-						} else {
-							Logger.VerboseDebug("{0} CAN'T EXCHANGE {1}", thatBlock.Code, renamedAsset);
-						}
-					}
+				if (this.CurrentRotationMode(slot) == RotationModes.Free) {
+					FreeRotation(blockSel, byEntity, thePlayer, thatBlock, position);
 				} else {
-#if DEBUG
-					ServerApi.SendMessage(thePlayer, GlobalConstants.CurrentChatGroup, "Angle U/D.", EnumChatType.Notification);
-#endif
-
-					renamedAsset = thatBlock.GetVerticallyFlippedBlockCode( );
-
-					//Special Case for Slabs in N/E/S/W mode when trying to rotate them back 'up'
-					if (IsSlabNEWS(thatBlock)) renamedAsset = SpecialSlabVerticalFlipCase(thatBlock);
-
-					if (IsWoodLog(thatBlock)) renamedAsset = WoodOmniFlip(thatBlock, blockSel.Face.Axis, rotateHorizontal); //Wood logs also special
-
-					if (renamedAsset != thatBlock.Code) {
-
-#if DEBUG
-						Logger.VerboseDebug("{0} Becomes {1}", thatBlock.Code, renamedAsset);
-#endif
-
-						var rotatedBlock = ServerApi.World.GetBlock(renamedAsset);
-						if (rotatedBlock != null) {
-							ServerApi.World.BlockAccessor.ExchangeBlock(rotatedBlock.BlockId, position);
-						} else {
-							Logger.VerboseDebug("{0} CAN'T EXCHANGE {1}", thatBlock.Code, renamedAsset);
-						}
-					}
+					FixedRotation(this.CurrentRotationMode(slot),blockSel, byEntity, thePlayer, thatBlock, position);
 				}
 
-				//System.Diagnostics.Debugger.Break( );
-#if SPAM
-				string firstName = thatBlock.Code.Path.Split( "-".ToCharArray( ) ).First( );
-
-				var variants = ServerApi.WorldManager.SearchBlockTypes(firstName, thatBlock.Code.Domain );
-
-				if ( variants != null && variants.Length > 0 ) {
-
-					ServerApi.SendMessage(thePlayer, GlobalConstants.CurrentChatGroup, string.Format( "Block has {0} variants;", variants.Length ), EnumChatType.Notification );					 
-
-					foreach(var variant in variants) {
-						ServerApi.SendMessage(thePlayer, GlobalConstants.CurrentChatGroup,variant.Code.ToShortString(), EnumChatType.Notification );					 
-						Logger.VerboseDebug("{0} has Variant: {1}", firstName, variant.Code );
-					}
-				}
-#endif
-				//secondsUsed += 0.5;
 
 				DamageItem(ServerApi.World, byEntity, slot);
 
@@ -304,31 +233,31 @@ namespace Adjustor
 
 			switch (rotateMode) {
 			case RotationModes.Free:
-				DrawTextGlyph(cr, x, y, width, height, color, "FREE");
+				DrawTextGlyph(cr, x, y, width, height, color, Lang.GetMatching("adjustor:rotation-free").ToUpperInvariant( ));
 				break;
 
 			case RotationModes.Up:
-				DrawTextGlyph(cr, x, y, width, height, color, "UP");
+				DrawTextGlyph(cr, x, y, width, height, color, Lang.GetMatching("adjustor:rotation-up").ToUpperInvariant( ));
 				break;
 
 			case RotationModes.Down:
-				DrawTextGlyph(cr, x, y, width, height, color, "DOWN");
+				DrawTextGlyph(cr, x, y, width, height, color, Lang.GetMatching("adjustor:rotation-down").ToUpperInvariant( ));
 				break;
 
 			case RotationModes.North:
-				DrawTextGlyph(cr, x, y, width, height, color, "NORTH");
+				DrawTextGlyph(cr, x, y, width, height, color, Lang.GetMatching("facing-north" ).ToUpperInvariant() );
 				break;
 
 			case RotationModes.East:
-				DrawTextGlyph(cr, x, y, width, height, color, "EAST");
+				DrawTextGlyph(cr, x, y, width, height, color, Lang.GetMatching("facing-east").ToUpperInvariant( ) );
 				break;
 
 			case RotationModes.West:
-				DrawTextGlyph(cr, x, y, width, height, color, "WEST");
+				DrawTextGlyph(cr, x, y, width, height, color,Lang.GetMatching("facing-west").ToUpperInvariant( ) );
 				break;
 
 			case RotationModes.South:
-				DrawTextGlyph(cr, x, y, width, height, color, "SOUTH");
+				DrawTextGlyph(cr, x, y, width, height, color, Lang.GetMatching("facing-south").ToUpperInvariant( ) );
 				break;
 
 			default:
@@ -558,6 +487,174 @@ namespace Adjustor
 			return thatBlock.Code.FirstPathPart(0).StartsWith(@"log", StringComparison.Ordinal);
 		}
 
+
+
+
+		/// <summary>
+		/// Rotation by any 'free' axis available to block
+		/// </summary>
+		/// <param name="blockSel">Block sel.</param>
+		/// <param name="byEntity">By entity.</param>
+		/// <param name="thePlayer">The player.</param>
+		private void FreeRotation(BlockSelection blockSel, EntityAgent byEntity, IPlayer thePlayer, Block thatBlock, BlockPos position)
+		{
+			bool rotateHorizontal = false;
+			AssetLocation renamedAsset = null;
+
+			switch (blockSel.Face.Axis) {
+			case EnumAxis.X:
+			case EnumAxis.Z:
+				rotateHorizontal = !byEntity.Controls.Sneak;
+				break;
+
+			case EnumAxis.Y:
+				rotateHorizontal = byEntity.Controls.Sneak;
+				break;
+			}
+
+			if (rotateHorizontal) {
+#if DEBUG
+				ServerApi.SendMessage(thePlayer, GlobalConstants.CurrentChatGroup, "Angle N/E/W/S.", EnumChatType.Notification);
+#endif
+
+				//So many HORIZONTAL Special Cases...
+				renamedAsset = thatBlock.GetRotatedBlockCode(90);//Except Fences 
+
+				if (IsSlabUD(thatBlock)) renamedAsset = SpecialSlabHorizontalFlipCase(thatBlock);
+
+				if (IsWoodLog(thatBlock)) renamedAsset = WoodOmniFlip(thatBlock, blockSel.Face.Axis, rotateHorizontal); //Wood logs also special
+
+
+				if (renamedAsset != thatBlock.Code) {
+#if DEBUG
+					Logger.VerboseDebug("{0} Becomes {1}", thatBlock.Code, renamedAsset);
+#endif
+
+					var rotatedBlock = ServerApi.World.GetBlock(renamedAsset);
+					if (rotatedBlock != null) {
+						ServerApi.World.BlockAccessor.ExchangeBlock(rotatedBlock.BlockId, position);
+					} else {
+						Logger.VerboseDebug("{0} CAN'T EXCHANGE {1}", thatBlock.Code, renamedAsset);
+					}
+				}
+			} else {
+#if DEBUG
+				ServerApi.SendMessage(thePlayer, GlobalConstants.CurrentChatGroup, "Angle U/D.", EnumChatType.Notification);
+#endif
+
+				renamedAsset = thatBlock.GetVerticallyFlippedBlockCode( );
+
+				//Special Case for Slabs in N/E/S/W mode when trying to rotate them back 'up'
+				if (IsSlabNEWS(thatBlock)) renamedAsset = SpecialSlabVerticalFlipCase(thatBlock);
+
+				if (IsWoodLog(thatBlock)) renamedAsset = WoodOmniFlip(thatBlock, blockSel.Face.Axis, rotateHorizontal); //Wood logs also special
+
+				if (renamedAsset != thatBlock.Code) {
+
+#if DEBUG
+					Logger.VerboseDebug("{0} Becomes {1}", thatBlock.Code, renamedAsset);
+#endif
+
+					var rotatedBlock = ServerApi.World.GetBlock(renamedAsset);
+					if (rotatedBlock != null) {
+						ServerApi.World.BlockAccessor.ExchangeBlock(rotatedBlock.BlockId, position);
+					} else {
+						Logger.VerboseDebug("{0} CAN'T EXCHANGE {1}", thatBlock.Code, renamedAsset);
+					}
+				}
+			}
+
+
+		}
+
+		/// <summary>
+		/// Fixed by type - force to that rotation; 'state'
+		/// </summary>
+		/// <param name="rotationModes">Rotation modes.</param>
+		/// <param name="blockSel">Block sel.</param>
+		/// <param name="byEntity">By entity.</param>
+		/// <param name="thePlayer">The player.</param>
+		/// <param name="thatBlock">That block.</param>
+		/// <param name="position">Position.</param>
+		private void FixedRotation(RotationModes rotationMode, BlockSelection blockSel, EntityAgent byEntity, IPlayer thePlayer, Block thatBlock, BlockPos position)
+		{
+			AssetLocation renamedAsset = RenameBlockFace(thatBlock, rotationMode);
+
+			if (renamedAsset != null) {
+
+				if (renamedAsset.Equals(thatBlock.Code) == false) {
+					#if DEBUG
+					Logger.VerboseDebug("{0} Forcing: {1}", thatBlock.Code, renamedAsset);
+					#endif
+
+					var rotatedBlock = ServerApi.World.GetBlock(renamedAsset);
+					if (rotatedBlock != null) {
+						ServerApi.World.BlockAccessor.ExchangeBlock(rotatedBlock.BlockId, position);
+					} else {
+						Logger.VerboseDebug("{0} CAN'T EXCHANGE {1}", thatBlock.Code, renamedAsset);
+					}
+				} else {
+					Logger.VerboseDebug("{0} IDENTICAL!? {1}", thatBlock.Code, renamedAsset);
+				}
+			}
+		}
+
+		private AssetLocation RenameBlockFace(Block thatBlock, RotationModes rotationMode)
+		{
+			string renamedLocationPath = null;
+			string rotationKey = null;
+
+			switch (rotationMode) {
+
+			case RotationModes.Up:
+			case RotationModes.Down:
+
+				rotationKey = thatBlock.Variant.Keys.FirstOrDefault(_verticalVariantKeys.Contains);//There better be only 1 axies here!
+				if (!string.IsNullOrEmpty(rotationKey))
+				{
+					string roatableValue = thatBlock.Variant[rotationKey];
+
+					renamedLocationPath = thatBlock.Code.Path.Replace(roatableValue, rotationMode.ToString().ToLowerInvariant() );
+
+					#if DEBUG
+					Logger.VerboseDebug("Variant vertical rotation {0}={1} to: {2}", rotationKey, roatableValue, renamedLocationPath);
+					#endif
+
+				}
+
+				break;
+
+			case RotationModes.North:
+			case RotationModes.East:
+			case RotationModes.West:
+			case RotationModes.South:
+
+				rotationKey = thatBlock.Variant.Keys.FirstOrDefault(_horizontalVariantKeys.Contains);//There better be only 1 axies here!
+				if (!string.IsNullOrEmpty(rotationKey)) {
+					string roatableValue = thatBlock.Variant[rotationKey];
+
+					renamedLocationPath = thatBlock.Code.Path.Replace(roatableValue, rotationMode.ToString( ).ToLowerInvariant( ));
+
+					#if DEBUG
+					Logger.VerboseDebug("Variant horizontal rotation {0}={1} to: {2}", rotationKey, roatableValue, renamedLocationPath);
+					#endif
+
+				}
+				break;
+
+			default:
+				throw new InvalidOperationException("Rotation Mode not Permissible!" );
+			}
+
+
+			if (!string.IsNullOrEmpty(renamedLocationPath)) {
+
+				return new AssetLocation(thatBlock.Code.Domain, renamedLocationPath);
+			}
+
+			return null;
+		}
+
 		#endregion
 
 		#region SVG TOOL ICONS
@@ -575,27 +672,29 @@ namespace Adjustor
 			Matrix matrix = cr.Matrix;
 
 			cr.Save( );
+			/*
 			float local_width = 220;
 			float local_height = 182;
 			float scale = Math.Min(width / local_width, height / local_height);
 			matrix.Translate(x + Math.Max(0, (width - local_width * scale) / 2), y + Math.Max(0, (height - local_height * scale) / 2));
 			matrix.Scale(scale, scale);
 			cr.Matrix = matrix;
+			*/
 
 			cr.Operator = Operator.Over;
 			pattern = new SolidPattern(ToCarioColor(color));
 			cr.SetSource(pattern);
 
 			cr.NewPath( );
-			cr.MoveTo(32, 16);
+			//cr.MoveTo(0, 16);
 			cr.Tolerance = 0.1;
 			cr.Antialias = Antialias.Default;
 			cr.FillRule = FillRule.Winding;
 
-			stampy.DrawTextLine(cr, CairoFont.WhiteMediumText( ).WithFontSize(96), text, 32D, 16);
-			cr.LineWidth = 3D;
-			cr.MoveTo(64, 16);
-			cr.RelLineTo(0D, 248D);
+			stampy.DrawTextLine(cr, CairoFont.WhiteMediumText( ).WithFontSize(96F).WithWeight(FontWeight.Bold), text, 8D, 16D);
+			//cr.LineWidth = 3D;
+			//cr.MoveTo(64, 16);
+			//cr.RelLineTo(0D, 248D);
 
 			cr.FillPreserve( );
 		}

--- a/AdjustorMod/assets/Adjustor/lang/en.json
+++ b/AdjustorMod/assets/Adjustor/lang/en.json
@@ -9,4 +9,8 @@
 	"adjustor:item-adjustmenttool_crude": "Crude Adjustment Tool", 
 	"adjustor:itemdesc-adjustmenttool-*": "Manipulate adjustable block types, without breaking them.",
     "adjustor:itemdesc-adjustmenttool_crude": "Crudely manipulate adjustable block types, without breaking them.", 
+    "adjustor:rotation-up":"UP",
+    "adjustor:rotation-down":"DOWN",
+    "adjustor:rotation-free":"FREE",
+    "adjustor:rotation-fixed":"FIXED",
 }