提交: 75ca75c4e259bc1467deb686d287e2fc25ec2d97 - adjustor (git)

Adjustor mod plugin for VS

Commit MetaInfo

• 修订版: 75ca75c4e259bc1467deb686d287e2fc25ec2d97 (tree)
• 时间: 2021-01-28 13:53:21
• 作者: melchior <melchior@user...>
• Commiter: melchior

Log Message

W.I.P. chute fixes

更改概述

• modified: AdjustorMod/AdjustorMod.csproj
• modified: AdjustorMod/Items/ItemAdjustor.cs
• add: AdjustorMod/Tamperers.cs

差异

--- a/AdjustorMod/AdjustorMod.csproj
+++ b/AdjustorMod/AdjustorMod.csproj
@@ -65,6 +65,7 @@
     <Compile Include="Items\ItemAdjustor.cs" />
     <Compile Include="Skills\AdjustorSkills.cs" />
     <Compile Include="Skills\RotationModes.cs" />
+    <Compile Include="Helpers.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>

--- a/AdjustorMod/Items/ItemAdjustor.cs
+++ b/AdjustorMod/Items/ItemAdjustor.cs
@@ -33,7 +33,7 @@ namespace AdjustorMod
 		private const string _axialRotationKey = @"rotation";//Trees and Pillars; ns, we, ud - axial rotation
 		private const string _verticalCode = @"vertical";
 
-		private const string _chuteCode = @"chute";//Just for "normal" Chutes...
+
 		private const string _chuteTypeStraight = @"straight";
 		private const string _chuteTypeCross = @"cross";
 		private const string _chuteTypeTjunction = @"t";
@@ -154,7 +154,7 @@ namespace AdjustorMod
 					Block thatBlock = byEntity.World.BlockAccessor.GetBlock(position);
 					var mode = CurrentRotationMode(itemslot);
 
-					if (RotatableByVariant(thatBlock) || RotatableByBehavior(thatBlock) || RotatableByAngledMeshEntity(thatBlock, position) || IsChute(thatBlock)) {
+					if (RotatableByVariant(thatBlock) || RotatableByBehavior(thatBlock) || RotatableByAngledMeshEntity(thatBlock, position) || thatBlock.IsChute( )) {
 						#if DEBUG
 						Logger.VerboseDebug("[{0}] Looks Rotatable, FromFace: {1}", thatBlock.Code.Path, blockSel.Face.Code);
 						ClientApi.ShowChatMessage(string.Format("Appears Rotatable: {0}", thatBlock.Code));
@@ -821,10 +821,7 @@ namespace AdjustorMod
 		return false;
 		}
 
-		private bool IsChute(Block thatBlock)
-		{			
-		return thatBlock.Code.BeginsWith(GlobalConstants.DefaultDomain, _chuteCode);
-		}
+
 
 
 
@@ -873,7 +870,7 @@ namespace AdjustorMod
 					#endif
 				}
 
-				if (IsChute(thatBlock)) {
+				if (thatBlock.IsChute()) {
 					renamedAsset = ChuteSpecificFlip(thatBlock, blockSel.Face.Axis, rotateHorizontal);
 				}
 
@@ -885,6 +882,7 @@ namespace AdjustorMod
 					var rotatedBlock = ServerApi.World.GetBlock(renamedAsset);
 					if (rotatedBlock != null) {
 						ServerApi.World.BlockAccessor.ExchangeBlock(rotatedBlock.BlockId, position);
+						ServerApi.TryUnborkChute(rotatedBlock, position);
 						return true;
 					} else {
 						Logger.VerboseDebug("{0} CAN'T EXCHANGE {1}", thatBlock.Code, renamedAsset);
@@ -913,7 +911,7 @@ namespace AdjustorMod
 					#endif
 				}
 
-				if (IsChute(thatBlock)) {
+				if (thatBlock.IsChute( )) {
 				renamedAsset = ChuteSpecificFlip(thatBlock, blockSel.Face.Axis, rotateHorizontal);
 				}
 
@@ -926,6 +924,7 @@ namespace AdjustorMod
 					var rotatedBlock = ServerApi.World.GetBlock(renamedAsset);
 					if (rotatedBlock != null) {
 						ServerApi.World.BlockAccessor.ExchangeBlock(rotatedBlock.BlockId, position);
+						ServerApi.TryUnborkChute(rotatedBlock, position);
 						return true;
 					} else {
 						Logger.VerboseDebug("{0} CAN'T EXCHANGE {1}", thatBlock.Code, renamedAsset);
@@ -948,7 +947,7 @@ namespace AdjustorMod
 		private bool FixedRotation(RotationModes rotationMode, BlockSelection blockSel, EntityAgent byEntity, IPlayer thePlayer, Block thatBlock, BlockPos position)
 		{
 		AssetLocation renamedAsset;
-		if (IsChute(thatBlock)) 
+		if (thatBlock.IsChute( )) 
 				{	renamedAsset = ChuteSpecificForce(thatBlock, rotationMode);	}
 			else { renamedAsset = RenameBlockFace(thatBlock, rotationMode); }
 
@@ -962,6 +961,7 @@ namespace AdjustorMod
 					var rotatedBlock = ServerApi.World.GetBlock(renamedAsset);
 					if (rotatedBlock != null) {
 						ServerApi.World.BlockAccessor.ExchangeBlock(rotatedBlock.BlockId, position);
+						ServerApi.TryUnborkChute(rotatedBlock, position);
 						return true;
 					} else {
 						Logger.VerboseDebug("{0} CAN'T EXCHANGE {1}", thatBlock.Code, renamedAsset);

--- /dev/null
+++ b/AdjustorMod/Tamperers.cs
@@ -0,0 +1,60 @@
+using System;
+
+using Vintagestory.API.Common;
+using Vintagestory.API.Config;
+using Vintagestory.API.MathTools;
+using Vintagestory.API.Server;
+using Vintagestory.GameContent;
+
+namespace AdjustorMod
+{
+	public static class Tamperers
+	{
+		private const string _chuteCode = @"chute";//Just for "normal" Chutes...
+
+		public static bool TryUnborkChute(this ICoreServerAPI ServerAPI, Block thatBlock, BlockPos position)
+		{
+		if (thatBlock.IsChute( )) {
+		var entity = ServerAPI.World.BlockAccessor.GetBlockEntity(position) as BlockEntityItemFlow;
+		UnborkChute_ItemFlowStates(entity);
+		return true;
+		}
+		return false;
+		}
+
+		private static void UnborkChute_ItemFlowStates( BlockEntityItemFlow itemFlowEntity)
+		{
+		if (itemFlowEntity == null) return;
+
+		var theChute = itemFlowEntity.Block as BlockChute;
+
+		if (theChute.Attributes != null) 
+		{
+			if (theChute.Attributes["pullFaces"].Exists) {
+			string[ ] faces = theChute.Attributes["pullFaces"].AsArray<string>(null);
+			itemFlowEntity.PullFaces = new BlockFacing[faces.Length];
+			for (int i = 0; i < faces.Length; i++) itemFlowEntity.PullFaces[i] = BlockFacing.FromCode(faces[i]);
+			}
+
+			if (theChute.Attributes["pushFaces"].Exists) {
+			string[ ] faces = theChute.Attributes["pushFaces"].AsArray<string>(null);
+			itemFlowEntity.PushFaces = new BlockFacing[faces.Length];
+			for (int i = 0; i < faces.Length; i++) itemFlowEntity.PushFaces[i] = BlockFacing.FromCode(faces[i]);
+			}
+
+			if (theChute.Attributes["acceptFromFaces"].Exists) {
+			string[ ] faces = theChute.Attributes["acceptFromFaces"].AsArray<string>(null);
+			itemFlowEntity.AcceptFromFaces = new BlockFacing[faces.Length];
+			for (int i = 0; i < faces.Length; i++) itemFlowEntity.AcceptFromFaces[i] = BlockFacing.FromCode(faces[i]);
+			}
+		}
+
+		}
+
+		public static bool IsChute(this Block thatBlock)
+		{
+		return thatBlock.Code.BeginsWith(GlobalConstants.DefaultDomain, _chuteCode);
+		}
+	}
+}
+