Commit: d47601f2e2257160b2e9845e0576023d100a9a79 - bam (git)

VS plugin mod for Basic Armour

Commit MetaInfo

• Révision: d47601f2e2257160b2e9845e0576023d100a9a79 (tree)
• l'heure: 2019-05-04 03:48:26
• Auteur: melchior <melchior@user...>
• Commiter: melchior

Message de Log

* AmourMeshRenderer.cs: Support future head pitch

rotations...eventually.

* ArmourModHookin.cs: V1.9 RC updates

* EntityArmourPlayer.cs: V1.9 related event / timing changes

* clothes-head-potmetal.json: tweaked coordinates

* modinfo.json: version minimum and, mod info update

Change Summary

• modified: ArmourMod/Armour/AmourMeshRenderer.cs
• modified: ArmourMod/Armour/ArmourModHookin.cs
• modified: ArmourMod/Armour/EntityArmourPlayer.cs
• modified: ArmourMod/assets/armourmod/itemtypes/wearable/clothes-head-potmetal.json
• modified: ArmourMod/modinfo.json

Modification

--- a/ArmourMod/Armour/AmourMeshRenderer.cs
+++ b/ArmourMod/Armour/AmourMeshRenderer.cs
@@ -36,9 +36,9 @@ namespace ArmourMod
 
 		public void OnRenderFrame(float deltaTime, EnumRenderStage stage)
 		{			
-			for (int i = 0; i < ClientApi.World.AllPlayers.Length; i++)
+			for (int i = 0; i < ClientApi.World.AllOnlinePlayers.Length; i++)
 			{
-				var aPlayer = ClientApi.World.AllPlayers[i];
+				var aPlayer = ClientApi.World.AllOnlinePlayers[i];
 
 				if ( aPlayer != null ) {
 					
@@ -51,7 +51,7 @@ namespace ArmourMod
 					{
 					EntityArmourPlayer armouredPlayer = aPlayer.Entity as EntityArmourPlayer;
 
-						if ( armouredPlayer.WornClothesItems.Count > 0 ) {
+						if ( armouredPlayer.RenderableWornArmours.Count > 0 ) {
 							
 							RenderWornArmour( armouredPlayer, rend, stage != EnumRenderStage.Opaque );
 
@@ -77,7 +77,7 @@ namespace ArmourMod
 				if ( rpi.CameraType == EnumCameraMode.FirstPerson ) return;
 			}
 
-			foreach(var wornItemTuple in armouredPlayer.WornClothesItems) {
+			foreach(var wornItemTuple in armouredPlayer.RenderableWornArmours) {
 
 				if ( !Armoury.ContainsKey( wornItemTuple.Value.Code ) ) {
 					ClientApi.Logger.Warning( "Armoury Item Missing KEY: {0} ! ** RENDER ABORTED **", wornItemTuple.Value.Code );
@@ -129,15 +129,26 @@ namespace ArmourMod
 					prog.AlphaTest = 0.01f;
 				}
 			
-				armourModelMatrix
-					.Scale( armourData.Armour_Transform.ScaleXYZ.X, armourData.Armour_Transform.ScaleXYZ.Y, armourData.Armour_Transform.ScaleXYZ.Z )
-					.Translate( attachPt.PosX / 16d + armourData.Armour_Transform.Translation.X, attachPt.PosY / 16d + armourData.Armour_Transform.Translation.Y, attachPt.PosZ / 16d + armourData.Armour_Transform.Translation.Z )
-					.RotateX(  (float)(attachPt.RotationX + armourData.Armour_Transform.Rotation.X) * GameMath.DEG2RAD )
-					.RotateY(  (float)(attachPt.RotationY + armourData.Armour_Transform.Rotation.Y) * GameMath.DEG2RAD )
-					.RotateZ(  (float)(attachPt.RotationZ + armourData.Armour_Transform.Rotation.Z) * GameMath.DEG2RAD )
-					.Translate(-(armourData.Armour_Transform.Origin.X), -(armourData.Armour_Transform.Origin.Y), -(armourData.Armour_Transform.Origin.Z));
-
-
+				if ( wornItemTuple.Key == EnumCharacterDressType.Head ) {
+					//Apply Head pitch for helmets
+					//ClientApi.World.Player.Entity.HeadPitch
+					armourModelMatrix
+						.Scale( armourData.Armour_Transform.ScaleXYZ.X, armourData.Armour_Transform.ScaleXYZ.Y, armourData.Armour_Transform.ScaleXYZ.Z )
+						.Translate( attachPt.PosX / 16d + armourData.Armour_Transform.Translation.X, attachPt.PosY / 16d + armourData.Armour_Transform.Translation.Y, attachPt.PosZ / 16d + armourData.Armour_Transform.Translation.Z )
+						.RotateX( (float)(attachPt.RotationX + armourData.Armour_Transform.Rotation.X) * GameMath.DEG2RAD )
+						.RotateY( (float)(attachPt.RotationY + armourData.Armour_Transform.Rotation.Y) * GameMath.DEG2RAD )
+						.RotateZ( (float)(attachPt.RotationZ + armourData.Armour_Transform.Rotation.Z) * GameMath.DEG2RAD )
+						.Translate( -(armourData.Armour_Transform.Origin.X), -(armourData.Armour_Transform.Origin.Y), -(armourData.Armour_Transform.Origin.Z) );
+				} else
+				{
+					armourModelMatrix
+						.Scale( armourData.Armour_Transform.ScaleXYZ.X, armourData.Armour_Transform.ScaleXYZ.Y, armourData.Armour_Transform.ScaleXYZ.Z )
+						.Translate( attachPt.PosX / 16d + armourData.Armour_Transform.Translation.X, attachPt.PosY / 16d + armourData.Armour_Transform.Translation.Y, attachPt.PosZ / 16d + armourData.Armour_Transform.Translation.Z )
+						.RotateX( (float)(attachPt.RotationX + armourData.Armour_Transform.Rotation.X) * GameMath.DEG2RAD )
+						.RotateY( (float)(attachPt.RotationY + armourData.Armour_Transform.Rotation.Y) * GameMath.DEG2RAD )
+						.RotateZ( (float)(attachPt.RotationZ + armourData.Armour_Transform.Rotation.Z) * GameMath.DEG2RAD )
+						.Translate( -(armourData.Armour_Transform.Origin.X), -(armourData.Armour_Transform.Origin.Y), -(armourData.Armour_Transform.Origin.Z) );
+				}
 
 
 				if ( isShadowPass ) {

--- a/ArmourMod/Armour/ArmourModHookin.cs
+++ b/ArmourMod/Armour/ArmourModHookin.cs
@@ -26,9 +26,9 @@ namespace ArmourMod
 			return 1.1D;
 		}
 
-		public override bool AllowRuntimeReload()
+		public override bool AllowRuntimeReload
 		{
-			return false;
+			get { return false; }
 		}
 
 		public override bool ShouldLoad(EnumAppSide forSide)

--- a/ArmourMod/Armour/EntityArmourPlayer.cs
+++ b/ArmourMod/Armour/EntityArmourPlayer.cs
@@ -22,7 +22,7 @@ namespace ArmourMod
 
 		private long client_callback;
 
-		public Dictionary<EnumCharacterDressType,Item> WornClothesItems { get; private set;}//Needs to be client side
+		public Dictionary<EnumCharacterDressType,Item> RenderableWornArmours { get; private set;}//Needs to be client side
 
 		public override void Initialize(Vintagestory.API.Common.Entities.EntityProperties properties, ICoreAPI api, long chunkindex3d)
 		{
@@ -30,8 +30,35 @@ namespace ArmourMod
 
 			CoreAPI = api;
 			Logger = api.World.Logger;
+
+			if (CoreAPI.Side.IsClient())
+			{
+				this.RenderableWornArmours = new Dictionary<EnumCharacterDressType, Item>(); // BEFORE RENDERER GETS THERE!
+				Logger.VerboseDebug("Renderable Worn Armours Dict assigned");
+			}
 		}
 
+		public override void OnEntityLoaded()
+		{
+			base.OnEntityLoaded();
+			Logger.VerboseDebug( "OnEntityLoaded - EntityArmourPlayer" );
+
+			Logger.VerboseDebug( "Side:{0}, gearInv == null?{1}", CoreAPI.Side.ToString( ), base.GearInventory == null );
+
+			if ( CoreAPI.Side == EnumAppSide.Client ) {								
+
+				//Attach to Inventory events
+				#if DEBUG
+				Logger.VerboseDebug( "Side:{0}, gearInv == null?{1}", CoreAPI.Side.ToString( ), base.GearInventory == null );
+				#endif
+
+				//base.GearInventory.SlotModified += ClientWatchSlotModified;
+
+				client_callback = CoreAPI.Event.RegisterCallback( ClientDelayHook, 300 );
+			}
+		}
+
+
 		public override void OnEntitySpawn()
 		{
 			base.OnEntitySpawn();
@@ -51,20 +78,7 @@ namespace ArmourMod
 
 				//Walk Inventory FIRST TIME ONLY
 				PopulateDamageFilters();
-			}
-
-			if ( CoreAPI.Side == EnumAppSide.Client ) {
-				this.WornClothesItems = new Dictionary<EnumCharacterDressType, Item>();
-
-				//Attach to Inventory events
-				#if DEBUG
-				Logger.VerboseDebug( "Side:{0}, gearInv == null?{1}", CoreAPI.Side.ToString( ), base.GearInventory == null );
-				#endif
-
-				//base.GearInventory.SlotModified += ClientWatchSlotModified;
-
-				client_callback = CoreAPI.Event.RegisterCallback( ClientDelayHook, 300 );
-			}
+			}				
 		}
 
 		public override void Die(EnumDespawnReason reason = EnumDespawnReason.Death, DamageSource damageSourceForDeath = null)
@@ -96,7 +110,7 @@ namespace ArmourMod
 				//clear client side entry too!
 				if ( loseArmourOnDeath ) {					
 
-					this.WornClothesItems.Clear( );
+					this.RenderableWornArmours.Clear( );
 				}
 			}
 		}
@@ -147,7 +161,7 @@ namespace ArmourMod
 			if ( !watchedSlot.Empty ) {
 
 				if ( watchedSlot.StorageType == EnumItemStorageFlags.Outfit && watchedSlot.Itemstack.Class == EnumItemClass.Item ) {					
-					if (CheckIfClothesIsArmour(watchedSlot)) 
+					if (CheckIfClothesIsArmour(watchedSlot) && CheckForCustomMesh(watchedSlot))  
 					{						
 						WearArmorModel( slotId, watchedSlot.Itemstack.Item );
 					} 
@@ -241,11 +255,11 @@ namespace ArmourMod
 
 		private void WearArmorModel(int slotId, Item wornArmour)
 		{		
-			if ( !WornClothesItems.ContainsKey( (EnumCharacterDressType)slotId ) ) {
+			if ( !RenderableWornArmours.ContainsKey( (EnumCharacterDressType)slotId ) ) {
 				#if DEBUG
 				Logger.VerboseDebug( "Wearing: {0}", wornArmour.Code.ToString( ) );
 				#endif
-				WornClothesItems.Add( (EnumCharacterDressType)slotId, wornArmour );
+				RenderableWornArmours.Add( (EnumCharacterDressType)slotId, wornArmour );
 			} else {
 				#if DEBUG
 				Logger.VerboseDebug( "Duplicate of SlotId {0} worn Armour: {1}",slotId ,wornArmour.Code.ToString( ) );
@@ -255,12 +269,12 @@ namespace ArmourMod
 
 		private void UnwearArmorModel(int slotId)
 		{
-			if ( WornClothesItems.ContainsKey( (EnumCharacterDressType)slotId ) ) {
-				var armourItem = WornClothesItems[(EnumCharacterDressType)slotId];
+			if ( RenderableWornArmours.ContainsKey( (EnumCharacterDressType)slotId ) ) {
+				var armourItem = RenderableWornArmours[(EnumCharacterDressType)slotId];
 				#if DEBUG
 				Logger.VerboseDebug( "UN-Wearing: {0}", armourItem.Code.ToString( ) );
 				#endif
-				WornClothesItems.Remove( (EnumCharacterDressType)slotId );
+				RenderableWornArmours.Remove( (EnumCharacterDressType)slotId );
 			} else {
 				#if DEBUG
 				Logger.VerboseDebug( "Non-armour removed, slotID{0}", slotId );
@@ -283,7 +297,7 @@ namespace ArmourMod
 								#if DEBUG
 								Logger.VerboseDebug( "Already wearing armour:{0}", itemSlot.Itemstack.Item.Code.ToString( ) );
 								#endif
-								WornClothesItems.Add( (EnumCharacterDressType)slotId, itemSlot.Itemstack.Item );
+								RenderableWornArmours.Add( (EnumCharacterDressType)slotId, itemSlot.Itemstack.Item );
 							} 
 						}
 					}	
@@ -365,6 +379,24 @@ namespace ArmourMod
 			return false;
 		}
 
+		public static bool CheckForCustomMesh(ItemSlot possibleArmour)
+		{
+			if (possibleArmour.Itemstack != null && possibleArmour.Itemstack.Item.Code.BeginsWith( "armourmod", "clothes" ) ) {
+
+				if (possibleArmour.Itemstack.ItemAttributes.Exists)
+					{
+						//shape: { base: "entity/humanoid/seraph" },
+
+						if (possibleArmour.Itemstack.Item.Shape != null)
+						{
+						return possibleArmour.Itemstack.Item.Shape.Base.BeginsWith( "game", "seraph" ) == false;
+						}
+					}					
+				}
+				
+			return false;
+		}
+
 		public static DamageFilter ConstructFilter(ItemSlot armourInSlot)
 		{
 			var blunt = armourInSlot.Itemstack.ItemAttributes["BluntProtection"].AsFloat( );

--- a/ArmourMod/assets/armourmod/itemtypes/wearable/clothes-head-potmetal.json
+++ b/ArmourMod/assets/armourmod/itemtypes/wearable/clothes-head-potmetal.json
@@ -65,7 +65,7 @@
 		scale: 3.75
 	},
 	thirdPersonTransform: {
-		translation: { x: -0.020, y: 0.09, z: -0.05 },
+		translation: { x: -0.020, y: 0.1, z: 0.00 },
 		rotation: { x: 0, y: 0, z: 0 },
 		scale: 1.1
 	}

--- a/ArmourMod/modinfo.json
+++ b/ArmourMod/modinfo.json
@@ -3,9 +3,9 @@
   "name": "Basic Armour Mod",
   "description" : "Leather, Plate, Scale & More",
   "authors": ["Melchior", "Bunnyviking"],
-  "version": "0.1.1",
+  "version": "0.1.2",
   "dependencies": { 
-	"game": "",
+	"game": "1.9.0-rc.4",
 	"survival": ""
   },
   "website": "http://nowebsite.nope"