Commit: 94eb9f434399b311e5f0a5b8e2ccdb9a0a6ed180 - adjustor (git)

Adjustor mod plugin for VS

Commit MetaInfo

• Revision: 94eb9f434399b311e5f0a5b8e2ccdb9a0a6ed180 (tree)
• Zeit: 2019-05-10 09:28:19
• Autor: melchior <melchior@user...>
• Commiter: melchior

Log Message

Fixes for V1.9.2, got wooden logs rotatable.

Ändern Zusammenfassung

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

Diff

--- a/AdjustorMod/ItemAdjustor.cs
+++ b/AdjustorMod/ItemAdjustor.cs
@@ -31,19 +31,24 @@ namespace Adjustor
 			@"north",
 			@"south",
 			@"east",
-			@"west" 
-		};//mabey add: ns, ew, ect...?
+			@"west",
+			//tree logs
+			@"ud",
+			@"ns",
+			@"we"
+		};
 
 		private static string[] blacklistedClasses =new string[] 
 		{
 			@"BlockBed",
 			@"BlockDoor",
 			@"BlockTroughDoubleBlock",
+			@"BlockFence" //Need to figure out a better way..
 		};
 
 		private static string[] whitelistedClasses =new string[] //BROEKN!
 		{			
-			@"BlockFence",
+			@"placeholder",
 		};
 
 		private static string[] blacklistedEntityClasses =new string[] 
@@ -53,7 +58,7 @@ namespace Adjustor
 
 		public ItemAdjustor( ) : base()
 		{			
-			//TODO: Fixed rotateion mode VS. Free-Rotation
+			//TODO: Fixed rotation mode VS. Free-Rotation
 		}
 
 		public override void OnLoaded(ICoreAPI api)
@@ -178,16 +183,13 @@ namespace Adjustor
 					ServerApi.SendMessage( thePlayer, GlobalConstants.CurrentChatGroup, "Angle N/E/W/S.", EnumChatType.Notification );					 
 					#endif
 
-					//Special Case for Slabs in N/E/S/W mode when trying to rotate them back 'up'
-					if ( IsSlabUD(thatBlock) ) {
-						#if DEBUG
-						Logger.VerboseDebug( "{0} Invokes Slab Special U/D case", thatBlock.Code );
-						#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
 
-						renamedAsset = SpecialSlabHorizontalFlipCase( thatBlock );
-					} else {
-						renamedAsset = thatBlock.GetRotatedBlockCode(90);//Except Fences 
-					}
 
 					if (renamedAsset != thatBlock.Code) {
 						#if DEBUG
@@ -206,16 +208,12 @@ namespace Adjustor
 					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) ) {
-						#if DEBUG
-						Logger.VerboseDebug( "{0} Invokes Slab Special N/E/W/S case", thatBlock.Code );
-						#endif
+					if ( IsSlabNEWS(thatBlock) ) renamedAsset = SpecialSlabVerticalFlipCase( thatBlock );
 
-						renamedAsset = SpecialSlabVerticalFlipCase( thatBlock );
-					} else {
-						renamedAsset = thatBlock.GetVerticallyFlippedBlockCode( );
-					}
+					if (IsWoodLog(thatBlock)) renamedAsset = WoodOmniFlip( thatBlock , blockSel.Face.Axis,rotateHorizontal ); //Wood logs also special
 
 					if (renamedAsset != thatBlock.Code) {
 
@@ -271,7 +269,7 @@ namespace Adjustor
 		}
 
 		/// <summary>
-		/// Is it Rotatable, possibly?
+		/// Is it Rotatable, possibly with Known direction?
 		/// </summary>
 		/// <returns><c>true</c>, if rotatable, <c>false</c> otherwise.</returns>
 		/// <param name="thatBlock">A block.</param>
@@ -297,7 +295,7 @@ namespace Adjustor
 		}
 
 		/// <summary>
-		/// Is it Rotatable, possibly?
+		/// Is it Rotatable, possibly via Behavior?
 		/// </summary>
 		/// <returns><c>true</c>, if rotatable, <c>false</c> otherwise.</returns>
 		/// <param name="thatBlock">A block.</param>
@@ -356,6 +354,43 @@ namespace Adjustor
 			return  new AssetLocation(thatBlock.Code.Domain,redirectionPath);//game or item tags?
 		}
 
+		private static AssetLocation WoodOmniFlip(Block thatBlock, EnumAxis axis, bool axisNormal)
+		{
+			string oppositeDirection = string.Empty;
+
+			//wood Log by: ns / we - change to opposite
+			string directionName = thatBlock.Code.Path.Split( "-".ToCharArray( ) ).Last( );
+			if ( axisNormal ) {
+				switch(directionName) {
+				case @"ud":
+					oppositeDirection = (axis == EnumAxis.X || axis == EnumAxis.Z) ? @"ns" : @"we";
+					break;
+				case @"ns":
+					oppositeDirection = (axis == EnumAxis.Y) ? @"ud" : @"we";
+					break;
+				case @"we":
+					oppositeDirection = (axis == EnumAxis.Y) ? @"ud" : @"ns";
+					break;			
+				}
+			} else {
+				switch(directionName) {
+				case @"ud":
+					oppositeDirection = (axis == EnumAxis.X) ? @"ns" : @"we";
+					break;
+				case @"ns":
+					oppositeDirection = @"ud";
+					break;
+				case @"we":
+					oppositeDirection = @"ud";
+					break;			
+				}
+			}
+
+			var redirectionPath = thatBlock.Code.Path.Replace(directionName,oppositeDirection );
+
+			return  new AssetLocation(thatBlock.Code.Domain,redirectionPath);
+		}
+
 		/// <summary>
 		/// Determines if is slab in N/E/W/S configuration
 		/// </summary>
@@ -398,6 +433,11 @@ namespace Adjustor
 			}
 			return false;
 		}
+
+		private static bool IsWoodLog(Block thatBlock)
+		{
+			return thatBlock.Code.FirstPathPart( 0).StartsWith(@"log" );
+		}
 	}
 
 

--- a/AdjustorMod/modinfo.json
+++ b/AdjustorMod/modinfo.json
@@ -1,11 +1,11 @@
 {
   "type": "code",
   "name": "Adjustment Tool",
-  "description" : "Alter, Rotate blocks without breaking them.",
+  "description" : "Alter, Rotate blocks without breaking them. (Even wood-logs)",
   "authors": ["Melchior", ],
-  "version": "0.1.5",
+  "version": "0.1.6",
   "dependencies": { 
-	"game": "1.9.0",
+	"game": "1.9.2",
 	"survival": ""
   },
   "website": "http://nowebsite.nope"