コミット: 5a362bba54a7e35b856c6bb5285b898f6320f8c1 - adjustor (git)

Adjustor mod plugin for VS

コミットメタ情報

• リビジョン: 5a362bba54a7e35b856c6bb5285b898f6320f8c1 (tree)
• 日時: 2019-06-07 05:53:47
• 作者: melchior <melchior@user...>
• コミッター: melchior

ログメッセージ

Item condition loss only when change made
Tool mode icons
Version incriment

変更サマリ

• modified: AdjustorMod/ItemAdjustor.cs
• modified: AdjustorMod/modinfo.json

差分

--- a/AdjustorMod/ItemAdjustor.cs
+++ b/AdjustorMod/ItemAdjustor.cs
@@ -172,6 +172,7 @@ namespace Adjustor
 			}
 
 			if (api.Side.IsServer( )) {
+				bool madeAdjustment = false;
 
 				BlockPos position = blockSel.Position;
 				Block thatBlock = byEntity.World.BlockAccessor.GetBlock(position);
@@ -189,18 +190,17 @@ namespace Adjustor
 
 				EnumWorldAccessResponse why = ServerApi.World.Claims.TestAccess(thePlayer, position, EnumBlockAccessFlags.BuildOrBreak);
 				if (why != EnumWorldAccessResponse.Granted) {
-					ServerApi.SendMessage(thePlayer, GlobalConstants.CurrentChatGroup, string.Format("Not permitted, {0}", why.ToString( )), EnumChatType.Notification);
+					ServerApi.SendMessage(thePlayer, GlobalConstants.CurrentChatGroup, string.Format("Not permitted, {0}", why), EnumChatType.Notification);
 					return false;
 				}
 
 				if (this.CurrentRotationMode(slot) == RotationModes.Free) {
-					FreeRotation(blockSel, byEntity, thePlayer, thatBlock, position);
+					madeAdjustment = FreeRotation(blockSel, byEntity, thePlayer, thatBlock, position);
 				} else {
-					FixedRotation(this.CurrentRotationMode(slot),blockSel, byEntity, thePlayer, thatBlock, position);
+					madeAdjustment = FixedRotation(this.CurrentRotationMode(slot),blockSel, byEntity, thePlayer, thatBlock, position);
 				}
 
-
-				DamageItem(ServerApi.World, byEntity, slot);
+				if (madeAdjustment) DamageItem(ServerApi.World, byEntity, slot);
 
 				return secondsUsed < 0.7;
 			}
@@ -249,39 +249,7 @@ namespace Adjustor
 		{
 			RotationModes rotateMode = ( RotationModes )toolMode;
 
-			switch (rotateMode) {
-			case RotationModes.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, Lang.GetMatching("adjustor:rotation-up").ToUpperInvariant( ));
-				break;
-
-			case RotationModes.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, Lang.GetMatching("facing-north" ).ToUpperInvariant() );
-				break;
-
-			case RotationModes.East:
-				DrawTextGlyph(cr, x, y, width, height, color, Lang.GetMatching("facing-east").ToUpperInvariant( ) );
-				break;
-
-			case RotationModes.West:
-				DrawTextGlyph(cr, x, y, width, height, color,Lang.GetMatching("facing-west").ToUpperInvariant( ) );
-				break;
-
-			case RotationModes.South:
-				DrawTextGlyph(cr, x, y, width, height, color, Lang.GetMatching("facing-south").ToUpperInvariant( ) );
-				break;
-
-			default:
-				throw new ArgumentOutOfRangeException( );
-			}
-
+			DrawTextGlyph(cr, x, y, width, height, color, rotateMode );
 		}
 
 		public override int GetToolMode(ItemSlot slot, IPlayer byPlayer, BlockSelection blockSelection)
@@ -539,7 +507,7 @@ namespace Adjustor
 		/// <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)
+		private bool FreeRotation(BlockSelection blockSel, EntityAgent byEntity, IPlayer thePlayer, Block thatBlock, BlockPos position)
 		{
 			bool rotateHorizontal = false;
 			AssetLocation renamedAsset = null;
@@ -587,6 +555,7 @@ namespace Adjustor
 					var rotatedBlock = ServerApi.World.GetBlock(renamedAsset);
 					if (rotatedBlock != null) {
 						ServerApi.World.BlockAccessor.ExchangeBlock(rotatedBlock.BlockId, position);
+						return true;
 					} else {
 						Logger.VerboseDebug("{0} CAN'T EXCHANGE {1}", thatBlock.Code, renamedAsset);
 					}
@@ -623,13 +592,14 @@ namespace Adjustor
 					var rotatedBlock = ServerApi.World.GetBlock(renamedAsset);
 					if (rotatedBlock != null) {
 						ServerApi.World.BlockAccessor.ExchangeBlock(rotatedBlock.BlockId, position);
+						return true;
 					} else {
 						Logger.VerboseDebug("{0} CAN'T EXCHANGE {1}", thatBlock.Code, renamedAsset);
 					}
 				}
 			}
 
-
+			return false;
 		}
 
 		/// <summary>
@@ -641,7 +611,7 @@ namespace Adjustor
 		/// <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)
+		private bool FixedRotation(RotationModes rotationMode, BlockSelection blockSel, EntityAgent byEntity, IPlayer thePlayer, Block thatBlock, BlockPos position)
 		{
 			AssetLocation renamedAsset = RenameBlockFace(thatBlock, rotationMode);
 
@@ -655,6 +625,7 @@ namespace Adjustor
 					var rotatedBlock = ServerApi.World.GetBlock(renamedAsset);
 					if (rotatedBlock != null) {
 						ServerApi.World.BlockAccessor.ExchangeBlock(rotatedBlock.BlockId, position);
+						return true;
 					} else {
 						Logger.VerboseDebug("{0} CAN'T EXCHANGE {1}", thatBlock.Code, renamedAsset);
 					}
@@ -664,6 +635,8 @@ namespace Adjustor
 					#endif
 				}
 			}
+
+			return false;
 		}
 
 		private AssetLocation RenameBlockFace(Block thatBlock, RotationModes rotationMode)
@@ -731,23 +704,97 @@ namespace Adjustor
 			return new Color(r: ColorUtil.ToRGBADoubles(color)[0], g: ColorUtil.ToRGBADoubles(color)[1], b: ColorUtil.ToRGBADoubles(color)[2], a: ColorUtil.ToRGBADoubles(color)[3]);
 		}
 
-		private void DrawTextGlyph(Context cr, int x, int y, int width, int height, int color, string text)
+		private void DrawTextGlyph(Context cr, int x, int y, int width, int height, int color, RotationModes toolMode)
 		{
+			string text = string.Empty;
 			TextDrawUtil stampy = new TextDrawUtil( );
 
 			Pattern pattern = null;
 			Matrix matrix = cr.Matrix;
 
 			cr.Save( );
+
+			ElementBounds bounds = ElementBounds.Fixed(width, height);
+
 			/*
-			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;
+			if (cr.GetTarget( ) is ImageSurface) {
+				ImageSurface imgSurface = ( ImageSurface )cr.GetTarget( );
+				bounds = ElementBounds.Fixed(imgSurface.Width, imgSurface.Height);
+			}
 			*/
 
+			CairoFont font = CairoFont.WhiteMediumText( );
+			font.StrokeColor = ColorUtil.BlackArgbDouble;
+			font.FontWeight = FontWeight.Bold;
+
+			switch (toolMode) {
+			case RotationModes.Free:
+				text = Lang.GetMatching("adjustor:rotation-free").ToUpper( );
+
+				cr.SetSourceRGB(0D, 0.75D, 0D);
+				cr.Arc(24, 24, 18, 0, 6D);
+				cr.Stroke( );
+
+				break;
+
+			case RotationModes.Up:
+				text = Lang.GetMatching("adjustor:rotation-up").ToUpper( );
+
+				cr.SetSourceRGB(0.85D, 0.85D, 0.85D);
+				cr.Rectangle(4, 4, 38, 8);
+				cr.Stroke( );
+
+				break;
+
+			case RotationModes.Down:
+				text = Lang.GetMatching("adjustor:rotation-down").ToUpper( );
+
+				cr.SetSourceRGB(0.85D, 0.85D, 0.85D);
+				cr.Rectangle(4, 34, 38, 8);
+				cr.Stroke( );
+
+				break;
+
+			case RotationModes.North:
+				text = Lang.GetMatching("facing-north").ToUpper( );
+
+				cr.SetSourceRGB(0.95D, 0D, 0D);
+				cr.MoveTo(24, 24);
+				cr.RelLineTo(0, -16);
+				cr.Stroke( );
+				break;
+
+			case RotationModes.East:
+				text = Lang.GetMatching("facing-east").ToUpper( );
+
+				cr.SetSourceRGB(0.85D, 0.85D, 0.85D);
+				cr.LineWidth = 1.0D;
+				cr.MoveTo(24, 24);
+				cr.RelLineTo(16, 0);
+				cr.Stroke( );
+				break;
+
+			case RotationModes.West:
+				text = Lang.GetMatching("facing-west").ToUpper( );
+
+				cr.SetSourceRGB(0.85D, 0.85D, 0.85D);
+				cr.LineWidth = 1.0D;
+				cr.MoveTo(24, 24);
+				cr.RelLineTo(-16, 0);
+				cr.Stroke( );
+				break;
+
+			case RotationModes.South:
+				text = Lang.GetMatching("facing-south").ToUpper( );
+
+				cr.SetSourceRGB(0.85D, 0.85D, 0.85D);
+				cr.LineWidth = 1.0D;
+				cr.MoveTo(24, 24);
+				cr.RelLineTo(0, 16);
+				cr.Stroke( );
+				break;
+			}
+
 			cr.Operator = Operator.Over;
 			pattern = new SolidPattern(ToCarioColor(color));
 			cr.SetSource(pattern);
@@ -758,17 +805,15 @@ namespace Adjustor
 			cr.Antialias = Antialias.Default;
 			cr.FillRule = FillRule.Winding;
 
-			stampy.DrawTextLine(cr, CairoFont.WhiteMediumText( ).WithFontSize(96F).WithWeight(FontWeight.Bold), text, 8D, 16D);
-			//cr.LineWidth = 3D;
-			//cr.MoveTo(64, 16);
-			//cr.RelLineTo(0D, 248D);
+			font.AutoFontSize(text, bounds);
+			font.UnscaledFontsize += 25;
+
+	       	stampy.DrawTextLine(cr, font, text, 4D, height/2);
 
 			cr.FillPreserve( );
 		}
 
 
-
-
 		#endregion
 	}		
 }

--- a/AdjustorMod/modinfo.json
+++ b/AdjustorMod/modinfo.json
@@ -3,7 +3,7 @@
   "name": "Adjustment Tool",
   "description" : "Alter, Rotate blocks without breaking them. Now with Economy tool!",
   "authors": ["Melchior", ],
-  "version": "0.1.7",
+  "version": "0.1.8",
   "dependencies": { 
 	"game": "1.9.6",
 	"survival": ""