提交: 6340b87b164e47a8226af68f2fa159f998acc8f3 - adjustor (git)

Adjustor mod plugin for VS

Commit MetaInfo

• 修訂: 6340b87b164e47a8226af68f2fa159f998acc8f3 (tree)
• 時間: 2021-01-06 12:15:58
• 作者: melchior <melchior@user...>
• Commiter: melchior

Log Message

Mesh rotation works....mostly

Change Summary

• modified: AdjustorMod/AdjustorMod.csproj
• modified: AdjustorMod/Items/ItemAdjustor.cs
• modified: AdjustorMod/assets/Adjustor/recipes/smithing/adjustor.json
• modified: AdjustorMod/modinfo.json

差異

--- a/AdjustorMod/AdjustorMod.csproj
+++ b/AdjustorMod/AdjustorMod.csproj
@@ -7,7 +7,7 @@
     <OutputType>Library</OutputType>
     <RootNamespace>AdjustorMod</RootNamespace>
     <AssemblyName>AdjustorMod</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -56,6 +56,8 @@
       <HintPath>VC_libs\cairo-sharp.dll</HintPath>
       <Private>False</Private>
     </Reference>
+    <Reference Include="System.Dynamic" />
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Properties\AssemblyInfo.cs" />

--- a/AdjustorMod/Items/ItemAdjustor.cs
+++ b/AdjustorMod/Items/ItemAdjustor.cs
@@ -1,20 +1,17 @@
 using System;
-
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
 using System.Linq;
-using System.Text.RegularExpressions;
+using System.Text;
+using System.Dynamic;
+using System.Runtime;
 
 using Vintagestory.API.Common;
-using Vintagestory.API.Datastructures;
 using Vintagestory.API.MathTools;
 using Vintagestory.API.Config;
 using Vintagestory.API.Server;
 using Vintagestory.API.Client;
 
-using Cairo;
-using System.Text;
+using Vintagestory.GameContent;
+
 
 //using Vintagestory.ServerMods;
 
@@ -27,6 +24,7 @@ namespace AdjustorMod
 		private ILogger Logger { get; set; }
 		private ICoreClientAPI ClientApi { get; set; }
 
+		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....
@@ -69,9 +67,10 @@ namespace AdjustorMod
 
 		private static string[] _blacklistedEntityClasses = new string[]
 		{
-			@"GenericTypedContainer",
+			//@"GenericTypedContainer",
 		};
 
+
 		private static string[] _verticalVariantKeys = new string[]
 		{
 			"verticalorientation",
@@ -108,7 +107,9 @@ namespace AdjustorMod
 				this.ClientApi = ( ICoreClientAPI )api;
 				this.Logger = this.ClientApi.World.Logger;
 			}
-			Logger.VerboseDebug("ItemAdjustor ~ OnLoaded");
+			#if DEBUG
+			Logger.VerboseDebug("{0} >> ItemAdjustor ~ OnLoaded", this.Code);
+			#endif
 		}
 
 		public override bool OnHeldInteractCancel(float secondsUsed, ItemSlot slot, EntityAgent byEntity, BlockSelection blockSel, EntitySelection entitySel, EnumItemUseCancelReason cancelReason)
@@ -138,7 +139,7 @@ namespace AdjustorMod
 					BlockPos position = blockSel.Position;
 					Block thatBlock = byEntity.World.BlockAccessor.GetBlock(position);
 
-					if (RotatableByVariant(thatBlock) || RotatableByBehavior(thatBlock)) {
+					if (RotatableByVariant(thatBlock) || RotatableByBehavior(thatBlock) || RotatableByAngledMeshEntity(thatBlock, position)) {
 						#if DEBUG
 						Logger.VerboseDebug("[{0}] Looks Rotatable, FromFace: {1}", thatBlock.Code.Path, blockSel.Face.Code);
 						ClientApi.ShowChatMessage(string.Format("Appears Rotatable: {0}", thatBlock.Code));
@@ -176,7 +177,6 @@ namespace AdjustorMod
 				Block thatBlock = byEntity.World.BlockAccessor.GetBlock(position);
 				IPlayer thePlayer = null;
 
-
 				if (byEntity is EntityPlayer) {
 					thePlayer = ServerApi.World.PlayerByUid((( EntityPlayer )byEntity).PlayerUID);
 				}
@@ -191,11 +191,16 @@ namespace AdjustorMod
 					ServerApi.SendMessage(thePlayer, GlobalConstants.CurrentChatGroup, string.Format("Not permitted, {0}", why), EnumChatType.Notification);
 					return false;
 				}
+				var meshSpin = RotatableByAngledMeshEntity(thatBlock, position);
 
-				if (this.CurrentRotationMode(slot) == RotationModes.Free) {
-					madeAdjustment = FreeRotation(blockSel, byEntity, thePlayer, thatBlock, position);
-				} else {
-					madeAdjustment = FixedRotation(this.CurrentRotationMode(slot),blockSel, byEntity, thePlayer, thatBlock, position);
+				if (meshSpin) {
+					madeAdjustment = MeshRotation(this.CurrentRotationMode(slot), thePlayer, thatBlock, position);
+				}
+				else if (this.CurrentRotationMode(slot) == RotationModes.Free) {
+				madeAdjustment = FreeRotation(blockSel, byEntity, thePlayer, thatBlock, position);
+				}
+				else {
+				madeAdjustment = FixedRotation(this.CurrentRotationMode(slot), blockSel, byEntity, thePlayer, thatBlock, position);
 				}
 
 				if (madeAdjustment) DamageItem(ServerApi.World, byEntity, slot);
@@ -354,6 +359,22 @@ namespace AdjustorMod
 			return false;
 		}
 
+		private bool RotatableByAngledMeshEntity(Block thatBlock, BlockPos pos)
+		{
+		//Coulda: (IAngledMeshBlockEnt >>> public virtual float MeshAngle ) ---but Nooooo....
+		//Annnd the 1st thing is to try for the BlockEntity...
+		var mabeyBE = Api.World.BlockAccessor.GetBlockEntity(pos.Copy( ));
+		if (mabeyBE != null) 
+		{
+		var someType = mabeyBE.GetType( );
+		if (someType.GetProperty(_meshAngleKey) != null) return true;
+		if (someType.GetField(_meshAngleKey) != null) return true;
+		}
+
+
+		return false;
+		}
+
 		/// <summary>
 		/// Determines if slab, sheet, plate type block in a N/E/W/S configuration
 		/// </summary>
@@ -637,6 +658,30 @@ namespace AdjustorMod
 			return false;
 		}
 
+		/// <summary>
+		/// rotation by/to MESH - not block!
+		/// </summary>
+		/// <returns>The rotation.</returns>
+		/// <param name="rotationModes">Rotation modes.</param>
+		/// <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)
+		{//Context: SERVER!
+		bool rotateClockwise = rotationModes != RotationModes.West;
+		
+		dynamic subjectBE = ServerApi.World.BlockAccessor.GetBlockEntity(position);
+		
+		if (rotateClockwise) 
+			{ subjectBE.MeshAngle += 45; }
+			else 
+			{ subjectBE.MeshAngle -= 45; }
+					
+		subjectBE.MarkDirty(true);		
+
+		return false;
+		}
+
 		private AssetLocation RenameBlockFace(Block thatBlock, RotationModes rotationMode)
 		{
 			string renamedLocationPath = null;

--- a/AdjustorMod/assets/Adjustor/recipes/smithing/adjustor.json
+++ b/AdjustorMod/assets/Adjustor/recipes/smithing/adjustor.json
@@ -1,12 +1,12 @@
 {
 	ingredient: { type: "item", code: "game:ingot-*", name: "metal", allowedVariants: ["copper", "tinbronze", "bismuthbronze", "blackbronze", "iron"] },
-	pattern: [
+	pattern: [[
 		"_####______#____",
 		"_#__#______##___",
 		"____############",
 		"_#__#______##___",
 		"_####______#____",
-	],
+	]],
 	name: "Adjustor",
 	output: { type: "item", code: "adjustmenttool-{metal}"   }
 }
\ No newline at end of file

--- a/AdjustorMod/modinfo.json
+++ b/AdjustorMod/modinfo.json
@@ -1,12 +1,12 @@
 {
   "type": "code",
   "name": "Adjustment Tool",
-  "description" : "Alter, Rotate blocks without breaking them. Now with Economy tool!",
+  "description" : "Reposition and Rotate blocks without breaking them. (Even chutes)",
   "authors": ["Melchior" ],
   "contributors": ["bunnyviking"],
-  "version": "0.1.10",
+  "version": "0.1.11",
   "dependencies": { 
-	"game": "1.12.0",
+	"game": "1.14.0",
 	"survival": ""
   },
   "website": "http://nowebsite.nope"