Commit: fd5592b782601ff49a2fd861ea8da5cca36ad760 - bam (git)

VS plugin mod for Basic Armour

Commit MetaInfo

• Révision: fd5592b782601ff49a2fd861ea8da5cca36ad760 (tree)
• l'heure: 2019-05-25 10:04:24
• Auteur: melchior <melchior@user...>
• Commiter: melchior

Message de Log

Workaround for duplicated event registration from OnLoad call(s),
New tooltips for armour

Change Summary

• modified: ArmourMod/Armour/ArmourModHookin.cs
• modified: ArmourMod/Armour/EntityArmourPlayer.cs
• add: ArmourMod/Armour/ItemArmour.cs
• modified: ArmourMod/ArmourMod.csproj
• modified: ArmourMod/assets/armourmod/itemtypes/wearable/clothes-head-potmetal.json
• modified: ArmourMod/assets/armourmod/itemtypes/wearable/clothes-upperbodyover-vest.json

Modification

--- a/ArmourMod/Armour/ArmourModHookin.cs
+++ b/ArmourMod/Armour/ArmourModHookin.cs
@@ -21,6 +21,7 @@ namespace ArmourMod
 		internal const string _domain = @"armourmod";
 		private const string _thirdPersonKey = @"thirdPersonTransform";
 		internal const string _configFilename = @"armourmod.json";
+		private const string _itemArmourName = @"ItemArmour";
 
 		private ICoreServerAPI ServerAPI;
 		private ICoreClientAPI ClientAPI;
@@ -57,7 +58,7 @@ namespace ArmourMod
 
 		public override double ExecuteOrder()
 		{
-			return 1.1D;
+			return 0.19D;
 		}
 
 		public override bool AllowRuntimeReload
@@ -76,6 +77,7 @@ namespace ArmourMod
 			base.Start(api);
 			this.CoreAPI = api;
 
+			api.RegisterItemClass(_itemArmourName, typeof(ItemArmour));
 		}
 
 		public override void StartServerSide(ICoreServerAPI api)

--- a/ArmourMod/Armour/EntityArmourPlayer.cs
+++ b/ArmourMod/Armour/EntityArmourPlayer.cs
@@ -12,6 +12,7 @@ namespace ArmourMod
 {
 	public class EntityArmourPlayer : EntityPlayer
 	{
+		private static string _clientHookIdKey = @"ClientDelayHookId";
 		protected ICoreAPI CoreAPI;
 		protected ICoreClientAPI ClientAPI;
 		protected ICoreServerAPI ServerAPI;
@@ -23,24 +24,46 @@ namespace ArmourMod
 		//Pre-compute values;
 		private DamageFilter finalFilter;
 
-		private long recurringClientDelayHookId;
-		private long oneShotDelayId;
 		private bool slotEventAttached;
 
 
 		internal ArmourModConfig CachedConfiguration 
 		{
 			get 
-			{	
+			{
 				if (CoreAPI.Side.IsServer( )) {
 					return ( ArmourModConfig )ServerAPI.ObjectCache[ArmourModHookin._configFilename];
 				} else {
 					return ( ArmourModConfig )ClientAPI.ObjectCache[ArmourModHookin._configFilename];
 				}
-							
 			}
 		}
 
+		private long CachedClientCallbackId 
+		{
+			get 
+			{				
+				if (ClientAPI.ObjectCache.ContainsKey(_clientHookIdKey + ClientAPI.World.Player.PlayerUID)) 
+				{
+					return (long)ClientAPI.ObjectCache[_clientHookIdKey + ClientAPI.World.Player.PlayerUID];
+				} else {
+					return -1L;
+				}
+			}
+			set 
+			{
+				if (ClientAPI.ObjectCache.ContainsKey(_clientHookIdKey + ClientAPI.World.Player.PlayerUID)) 
+				{
+					Logger.Error("Trying to register duplicate callback-id [value: {0}]", value); ;
+				}
+				 else 
+				{
+					ClientAPI.ObjectCache[_clientHookIdKey + ClientAPI.World.Player.PlayerUID] = value;
+				}
+			}
+		}
+
+
 		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)
@@ -65,24 +88,26 @@ namespace ArmourMod
 			}
 		}
 
-		public override void OnEntityLoaded()
+		public override void OnGameTick(float dt) 
 		{
-			base.OnEntityLoaded();
-			#if DEBUG
-			Logger.VerboseDebug( "OnEntityLoaded - EntityArmourPlayer" );
+			base.OnGameTick(dt);
 
-			Logger.VerboseDebug( "Side:{0}, gearInv == null?{1}", CoreAPI.Side.ToString( ), this.GearInventory == null );
-			#endif
 
-			if ( CoreAPI.Side.IsClient() ) {								
+			if (CoreAPI.Side.IsClient( )) {
 
-				//Attach to Inventory events
-				#if DEBUG
-				Logger.VerboseDebug( "Side:{0}, gearInv == null?{1}", CoreAPI.Side.ToString( ), this.GearInventory == null );
-				#endif
+				if (ClientAPI.World.Player != null) {
 
-
-				this.oneShotDelayId  = ClientAPI.Event.RegisterGameTickListener(ClientDelayHook, 250);
+					if (this.CachedClientCallbackId > 0) {
+						#if DEBUG
+						Logger.VerboseDebug("[OnEntityLoaded] Duplicate event attach prevented");
+						#endif
+					} else {
+						this.CachedClientCallbackId = ClientAPI.Event.RegisterGameTickListener(ClientDelayHook, 250);
+						#if DEBUG
+						Logger.VerboseDebug("[OnEntityLoaded] oneShotDelayId: {0}", this.CachedClientCallbackId);
+						#endif
+					}
+				} 
 			}
 		}
 
@@ -258,43 +283,29 @@ namespace ArmourMod
 
 		protected void ClientDelayHook(float delay)
 		{
-			ClientAPI.Event.UnregisterGameTickListener(oneShotDelayId);
+			#if DEBUG
+			Logger.VerboseDebug("[clientDelayHook] oneShotDelayId: {0}", this.CachedClientCallbackId);
+			#endif
 
 			if (this.GearInventory == null) {
 				Logger.Error("ClientDelayHook: base.GearInventory IS NULL! ");
-				recurringClientDelayHookId = ClientAPI.Event.RegisterCallback(RecurringClientDelayHook, 100);
+
 				return;
 			}
 
 			if (slotEventAttached == false) {
 				slotEventAttached = true;
+				#if DEBUG
+				Logger.VerboseDebug("Attached ClientWatchSlotModified (ClientDelayHook)");
+				#endif
 				this.GearInventory.SlotModified += ClientWatchSlotModified;
 			}
 
-			PopulateWornArmourModels( );
-		}
-
-		protected void RecurringClientDelayHook(float delayed)
-		{			
-			if (this.GearInventory == null) {
-				Logger.Error("RecurringClientDelayHook: base.GearInventory IS NULL! ");
+			ClientAPI.Event.UnregisterGameTickListener(this.CachedClientCallbackId);
 
-				return;
-			} else {
-				Logger.Notification("RecurringClientDelayHook: Finally the Gear data arrived - can proceed with event hooks");
-
-				ClientAPI.Event.UnregisterCallback(recurringClientDelayHookId);
-
-				if (slotEventAttached == false) {
-					slotEventAttached = true;
-					this.GearInventory.SlotModified += ClientWatchSlotModified;
-				}
-				PopulateWornArmourModels( );
-			}
+			PopulateWornArmourModels( );
 		}
 
-
-
 		private void ServerWatchSlotModified (int slotId)
 		{
 			var watchedSlot = this.GearInventory[slotId];
@@ -332,8 +343,9 @@ namespace ArmourMod
 		private void ClientWatchSlotModified (int slotId)
 		{
 			#if DEBUG
-			Logger.VerboseDebug( "(Client) WatchSlotModified:{0}", slotId );
+			Logger.VerboseDebug( "(Client) WatchSlotModified:{0} PlayerID: {1} InventoryID: {2}", slotId, ClientAPI.World.Player.PlayerUID,this.GearInventory.InventoryID );
 			#endif
+
 			var watchedSlot = this.GearInventory[slotId];
 
 			if ( !watchedSlot.Empty ) {
@@ -468,9 +480,9 @@ namespace ArmourMod
 
 							if ( CheckIfClothesIsArmour(itemSlot) ) 
 							{
-#if DEBUG
+								#if DEBUG
 								Logger.VerboseDebug( "Now wearing armour:{0}", itemSlot.Itemstack.Item.Code.ToString( ) );
-#endif
+								#endif
 
 								if (RenderableWornArmours.ContainsKey(( EnumCharacterDressType )slotId)) {
 									Logger.Warning("DUPLICATE assignment; Armour in slot: {0} named: {1}", slotId, itemSlot.Itemstack.Item.Code.ToString( ));

--- /dev/null
+++ b/ArmourMod/Armour/ItemArmour.cs
@@ -0,0 +1,51 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+using Vintagestory.API.Common;
+using Vintagestory.API.Common.Entities;
+using Vintagestory.API.Config;
+using Vintagestory.GameContent;
+
+namespace ArmourMod
+{
+	public class ItemArmour : ItemDress
+	{
+		public override void GetHeldItemInfo(ItemStack stack, StringBuilder dsc, IWorldAccessor world, bool withDebugInfo)
+		{
+			//base.GetHeldItemInfo(stack, dsc, world, withDebugInfo);
+
+			if (this.Durability > 1) {
+				dsc.AppendLine(Lang.Get("Durability: {0} / {1}", new object[] {
+			stack.Attributes.GetInt ("durability", this.Durability),
+			this.Durability}));
+			}
+
+			//Display Protection values
+			var blunt = stack.ItemAttributes["BluntProtection"].AsFloat( );
+			var piercing = stack.ItemAttributes["PiercingProtection"].AsFloat( );
+			var slashing = stack.ItemAttributes["SlashingProtection"].AsFloat( );
+			var crushing = stack.ItemAttributes["CrushingProtection"].AsFloat( );
+			var flame = stack.ItemAttributes["FireProtection"].AsFloat( );
+
+			dsc.AppendFormat("Protection:\n Blunt {0:P1}\n Piercing {1:P1}\n Slashing {2:P1}\n Crushing {3:P1}\n Flame {4:P1}",
+							 blunt,
+							 piercing,
+							 slashing,
+							 crushing,
+							 flame);
+
+			EnumCharacterDressType dresstype;
+			string strdress = stack.ItemAttributes["clothescategory"].AsString( );
+
+			if (!Enum.TryParse(strdress, true, out dresstype)) {
+				dsc.AppendLine(Lang.Get("Cloth Category: Unknown"));
+			} else {
+				dsc.AppendLine(Lang.Get("Cloth Category: {0}", Lang.Get("clothcategory-" + stack.ItemAttributes["clothescategory"].AsString( ))));
+			}
+		}
+	}
+}
+

--- a/ArmourMod/ArmourMod.csproj
+++ b/ArmourMod/ArmourMod.csproj
@@ -73,6 +73,7 @@
     <Compile Include="Armour\AmourMeshRenderer.cs" />
     <Compile Include="Armour\ArmourModelData.cs" />
     <Compile Include="Armour\ArmourModConfig.cs" />
+    <Compile Include="Armour\ItemArmour.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>

--- a/ArmourMod/assets/armourmod/itemtypes/wearable/clothes-head-potmetal.json
+++ b/ArmourMod/assets/armourmod/itemtypes/wearable/clothes-head-potmetal.json
@@ -1,6 +1,6 @@
 {
 	code: "clothes",
-	class: "ItemDress",
+	class: "ItemArmour",
 	variantgroups: [
 		{ code: "category",  states: ["head"] },
 		{ code: "head", combine: "SelectiveMultiply", onVariant: "category", 

--- a/ArmourMod/assets/armourmod/itemtypes/wearable/clothes-upperbodyover-vest.json
+++ b/ArmourMod/assets/armourmod/itemtypes/wearable/clothes-upperbodyover-vest.json
@@ -1,6 +1,6 @@
 {
 	code: "clothes",
-	class: "ItemDress",
+	class: "ItemArmour",
 	variantgroups: [
 		{ code: "category",  states: ["upperbodyover"] },
 		{ code: "upperbodyover", combine: "SelectiveMultiply", onVariant: "category",