Commit: e6d94c3df3c8d8fd09592894f3abfe8f15d8469f - bam (git)

VS plugin mod for Basic Armour

Commit MetaInfo

• Révision: e6d94c3df3c8d8fd09592894f3abfe8f15d8469f (tree)
• l'heure: 2019-05-18 06:37:16
• Auteur: melchior <melchior@user...>
• Commiter: melchior

Message de Log

Pushed server side config
refactorings

Change Summary

• add: ArmourMod/Armour/ArmourModConfig.cs
• modified: ArmourMod/Armour/ArmourModHookin.cs
• modified: ArmourMod/Armour/EntityArmourPlayer.cs
• modified: ArmourMod/ArmourMod.csproj
• modified: ArmourMod/assets/armourmod/lang/en.json

Modification

--- /dev/null
+++ b/ArmourMod/Armour/ArmourModConfig.cs
@@ -0,0 +1,17 @@
+using System;
+
+namespace ArmourMod
+{
+	
+	internal class ArmourModConfig
+	{
+		public bool DropArmourOnDeath { get; set; }
+
+		public ArmourModConfig( )
+		{
+			this.DropArmourOnDeath = false;
+
+		}
+	}
+}
+

--- a/ArmourMod/Armour/ArmourModHookin.cs
+++ b/ArmourMod/Armour/ArmourModHookin.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
+
 
 using Vintagestory.API;
 using Vintagestory.API.Common;
@@ -18,8 +18,42 @@ namespace ArmourMod
 {
 	public class ArmourModHookin: ModSystem
 	{
-		private static string _domain = @"armourmod";
-		private static string _thirdPersonKey = @"thirdPersonTransform";
+		internal const string _domain = @"armourmod";
+		private const string _thirdPersonKey = @"thirdPersonTransform";
+		internal const string _configFilename = @"armourmod.json";
+
+		private ICoreServerAPI ServerAPI;
+		private ICoreClientAPI ClientAPI;
+		private ICoreAPI CoreAPI;
+		private IServerNetworkChannel _sendConfigChannel;
+		private IClientNetworkChannel _receiveConfigChannel;
+
+		/// <summary>
+		/// Gets or sets the cached configuration.
+		/// </summary>
+		/// <value>The cached configuration.</value>
+		/// <remarks>Used BOTH "SIDES", switch implimentation automatically.</remarks>
+		internal ArmourModConfig CachedConfiguration 
+		{
+			get 
+			{
+				if (CoreAPI.Side.IsServer( )) {
+					return ( ArmourModConfig )ServerAPI.ObjectCache[_configFilename];
+				} else {
+					return ( ArmourModConfig )ClientAPI.ObjectCache[_configFilename];
+				}
+
+			}
+			set {
+
+				if (CoreAPI.Side.IsServer( )) {
+					ServerAPI.ObjectCache.Add(_configFilename, value);
+				} else {
+					ClientAPI.ObjectCache.Add(_configFilename, value);
+				}
+			}			 
+		}
+
 
 		public override double ExecuteOrder()
 		{
@@ -40,29 +74,103 @@ namespace ArmourMod
 		{
 			//Both Server parts and Client part(s)
 			base.Start(api);
+			this.CoreAPI = api;
 			var entityPlayerClassName = api.ClassRegistry.GetEntityClassName( typeof(EntityPlayer) );
 			api.RegisterEntity( entityPlayerClassName, typeof(EntityArmourPlayer) );// class swap 'EntityPlayer'
-			api.World.Logger.Debug("Replaced EntityPlayer with Armour version");
+			Mod.Logger.Notification("Replaced EntityPlayer with Armour version");
+		}
+
+		public override void StartServerSide(ICoreServerAPI api)
+		{
+			base.StartServerSide(api);
+
+			this.ServerAPI = api;
+
+			PrepareServersideConfig( );
 		}
 
 		public override void StartClientSide(ICoreClientAPI ClientApi)
-		{									
+		{
+			this.ClientAPI = ClientApi;
 			ClientApi.Event.BlockTexturesLoaded += () => {
-			ClientApi.Logger.VerboseDebug( "Armour Mod Populate Armoury, Attach Renderers " );
+			#if DEBUG
+			Mod.Logger.VerboseDebug( "Armour Mod Populate Armoury, Attach Renderers " );
+			#endif
 
 			var armorData = PopulateArmoury( ClientApi );
 			ArmourMeshRenderer theOne = new ArmourMeshRenderer(ClientApi, armorData );
 
 			//#if RENDER
-			ClientApi.Logger.VerboseDebug( "Registering Renderers for Armour");
+			Mod.Logger.VerboseDebug( "Registering Renderers for Armour");
 			ClientApi.Event.RegisterRenderer(theOne, EnumRenderStage.Opaque,this.Mod.Info.Name);
 			ClientApi.Event.RegisterRenderer(theOne, EnumRenderStage.ShadowFar,this.Mod.Info.Name);
 			ClientApi.Event.RegisterRenderer(theOne, EnumRenderStage.ShadowNear,this.Mod.Info.Name);      
 			//#endif
 			};
 
+			ListenForServerConfigMessage( );
 		}
 
+		#region Configuration Synch-up
+
+		private void PrepareServersideConfig( )
+		{
+			ArmourModConfig config = ServerAPI.LoadModConfig<ArmourModConfig>(_configFilename);
+
+			if (config == null) {
+				//Regen default
+				Mod.Logger.Warning("Regenerating default config as it was missing / unparsable...");
+				ServerAPI.StoreModConfig<ArmourModConfig>(new ArmourModConfig(), _configFilename);
+				config = ServerAPI.LoadModConfig<ArmourModConfig>(_configFilename);
+			}
+
+			this.CachedConfiguration = config;
+
+			//Setup channel for future use.
+			 _sendConfigChannel = ServerAPI.Network.RegisterChannel(_domain);
+			 _sendConfigChannel = _sendConfigChannel.RegisterMessageType<ArmourModConfig>( );
+
+			//Attach event upon client join to send them a copy of config settings
+			ServerAPI.Event.PlayerJoin += SendJoinerConfigMessage;
+		}
+
+		private void SendJoinerConfigMessage(IServerPlayer byPlayer)
+		{
+			#if DEBUG
+			Mod.Logger.VerboseDebug("Sending joiner: {0} a copy of config data.", byPlayer.PlayerName);
+			#endif
+
+			this._sendConfigChannel.SendPacket<ArmourModConfig>(this.CachedConfiguration, byPlayer);
+		}
+
+		private void ListenForServerConfigMessage( )
+		{			
+			_receiveConfigChannel = ClientAPI.Network.RegisterChannel(_domain);
+			_receiveConfigChannel = _receiveConfigChannel.RegisterMessageType<ArmourModConfig>( );
+
+			#if DEBUG
+			Mod.Logger.VerboseDebug("Registered RX channel: '{0}'", _receiveConfigChannel.ChannelName);
+			#endif
+
+			_receiveConfigChannel.SetMessageHandler<ArmourModConfig>(RecievedConfigMessage);
+		}
+
+		private void RecievedConfigMessage(ArmourModConfig networkMessage)
+		{
+			#if DEBUG
+			Mod.Logger.Debug("RX Config message!");
+			#endif
+
+			if (networkMessage != null) {
+				Mod.Logger.Debug("Message value; DropArmourOnDeath = {0}",networkMessage.DropArmourOnDeath);
+				this.CachedConfiguration = networkMessage;
+			}
+		}
+
+		#endregion
+
+
+
 		/// <summary>
 		/// Populates the Cached data for Rendering.
 		/// </summary>

--- a/ArmourMod/Armour/EntityArmourPlayer.cs
+++ b/ArmourMod/Armour/EntityArmourPlayer.cs
@@ -2,10 +2,12 @@
 using System.Collections.Generic;
 using System.Linq;
 
+
 using Vintagestory.API.Common;
 using Vintagestory.API.Client;
 using Vintagestory.API.Server;
-            
+
+
 namespace ArmourMod
 {
 	public class EntityArmourPlayer : EntityPlayer
@@ -16,15 +18,23 @@ namespace ArmourMod
 		protected ILogger Logger;
 
 		//Damage Filter list: BY Inventory SLOT#
-		private Dictionary<int,DamageFilter> DamageFilters;
-		//Pre-cook values: Covert to Coalesced filter sooon!
-		private float bluntPercentReduction = 0F;
-		private float piercingPercentReduction = 0F;
-		private float slashingPercentReduction = 0F;
-		private float crushingPercentReduction = 0F;
-		private float firePercentReduction = 0F;
+		private Dictionary<EnumCharacterDressType,DamageFilter> DamageFilters;
 
-		//private long client_callback;
+		//Pre-compute values;
+		private DamageFilter finalFilter;
+
+		internal ArmourModConfig CachedConfiguration 
+		{
+			get 
+			{	
+				if (CoreAPI.Side.IsServer( )) {
+					return ( ArmourModConfig )ServerAPI.ObjectCache[ArmourModHookin._configFilename];
+				} else {
+					return ( ArmourModConfig )ClientAPI.ObjectCache[ArmourModHookin._configFilename];
+				}
+							
+			}
+		}
 
 		public Dictionary<EnumCharacterDressType,Item> RenderableWornArmours { get; private set;}//Needs to be client side
 
@@ -43,8 +53,10 @@ namespace ArmourMod
 			}
 
 			if (CoreAPI.Side.IsServer( )) {
-				this.ServerAPI = api as ICoreServerAPI;
-
+				this.ServerAPI = api as ICoreServerAPI;			
+				//from Config set values;
+				//ServerAPI.ModLoader.
+				//ArmourModHookin._domain
 			}
 		}
 
@@ -63,7 +75,7 @@ namespace ArmourMod
 				#endif
 
 				//base.GearInventory.SlotModified += ClientWatchSlotModified;
-				ClientAPI.Event.PlayerJoin += ClientDelayHook; ;
+				ClientAPI.Event.PlayerJoin += ClientDelayHook;
 			}
 		}
 
@@ -94,18 +106,16 @@ namespace ArmourMod
 		{
 			base.Die( reason, damageSourceForDeath );
 
-			bool loseArmourOnDeath = true;
-
 			//(Properties.Server?.Attributes?.GetBool("keepContents", false) != true)
 			//  World.PlayerByUid(PlayerUID).InventoryManager.OnDeath();
 			if ( CoreAPI.Side.IsServer( ) ) {
 
-				if ( loseArmourOnDeath ) {
+				if ( this.CachedConfiguration.DropArmourOnDeath ) {
 					//Clear Armour filters; Drop Server side Armour Item,
 
 					var invBase = this.GearInventory as InventoryBasePlayer;
 					if ( invBase != null ) {
-						invBase.DropSlots( this.ServerPos.XYZ.Add( 0.5, 0.5, 0.5 ), this.DamageFilters.Keys.ToArray( ) );
+						invBase.DropSlots( this.ServerPos.XYZ.Add( 0.5, 0.5, 0.5 ), this.DamageFilters.Keys.Select(key => (int)key).ToArray());;
 					} else {
 						Logger.Error( "invBase NULL! - can't drop armour" );
 					}
@@ -117,7 +127,7 @@ namespace ArmourMod
 
 			if ( CoreAPI.Side.IsClient() ) {
 				//clear client side entry too!
-				if ( loseArmourOnDeath ) {					
+				if ( this.CachedConfiguration.DropArmourOnDeath ) {					
 
 					this.RenderableWornArmours.Clear( );
 				}
@@ -156,23 +166,23 @@ namespace ArmourMod
 					switch (damageSource.Type) {
 
 					case EnumDamageType.BluntAttack:
-						damage -= damage * bluntPercentReduction;
+						damage -= damage * finalFilter.bluntPercent;
 						break;
 
 					case EnumDamageType.PiercingAttack:
-						damage -= damage * piercingPercentReduction;
+						damage -= damage * finalFilter.piercingPercent;
 						break;
 
 					case EnumDamageType.SlashingAttack:
-						damage -= damage * slashingPercentReduction;
+						damage -= damage * finalFilter.slashingPercent;
 						break;
 
 					case EnumDamageType.Crushing:
-						damage -= damage * crushingPercentReduction;
+						damage -= damage * finalFilter.crushingPercent;
 						break;
 
 					case EnumDamageType.Fire:
-						damage -= damage * firePercentReduction;
+						damage -= damage * finalFilter.firePercent;
 						break;
 
 					default:
@@ -186,10 +196,10 @@ namespace ArmourMod
 				#endif
 
 				//All worn Armours adsorb damage themselves... 
-				List<int> slotsList = this.DamageFilters.Keys.ToList();
+				List<EnumCharacterDressType> slotsList = this.DamageFilters.Keys.ToList();
 
 				foreach (var slotId in slotsList) {
-					ItemSlot slot = this.GearInventory[slotId];
+					ItemSlot slot = this.GearInventory[(int)slotId];
 					Item armourItem = slot.Itemstack.Item;
 
 					armourItem.DamageItem(ServerAPI.World, damageSource.SourceEntity, slot, 1);
@@ -266,14 +276,14 @@ namespace ArmourMod
 
 					Logger.VerboseDebug( "Armour Filter Props: B{0} P{1} S{2} C{3} F{4}", dmgFilt.bluntPercent, dmgFilt.piercingPercent, dmgFilt.slashingPercent, dmgFilt.crushingPercent, dmgFilt.firePercent );
 
-					DamageFilters[slotId] = dmgFilt;
+					DamageFilters[(EnumCharacterDressType)slotId] = dmgFilt;
 					RecomputeDamageFilterPercents( );											
 					} 
 				}
 			} else if (watchedSlot.StorageType == EnumItemStorageFlags.Outfit){
 				//Clear out filters for what was in slot# X here - if applicable
 				Logger.VerboseDebug( "Removed a clothing item from SlotId:{0}",slotId );
-				DamageFilters.Remove( slotId );
+				DamageFilters.Remove((EnumCharacterDressType)slotId);
 				RecomputeDamageFilterPercents( );
 			}
 		}
@@ -310,12 +320,12 @@ namespace ArmourMod
 
 		private void PopulateDamageFilters()
 		{
-			DamageFilters = new Dictionary<int, DamageFilter>( 10 );
+			DamageFilters = new Dictionary<EnumCharacterDressType, DamageFilter>( Enum.GetNames(typeof(EnumCharacterDressType)).Length );
 
 			if ( this.GearInventory.Count > 0 ) {
 				foreach(var itemSlot in this.GearInventory ) {
 
-					int slotId = this.GearInventory.GetSlotId( itemSlot );
+					EnumCharacterDressType slotId = (EnumCharacterDressType)this.GearInventory.GetSlotId( itemSlot );
 					if ( !itemSlot.Empty ) {
 
 						if ( itemSlot.StorageType == EnumItemStorageFlags.Outfit && itemSlot.Itemstack.Class == EnumItemClass.Item ) {
@@ -348,25 +358,25 @@ namespace ArmourMod
 		{
 			if (DamageFilters != null && DamageFilters.Count > 0)
 			{				
-			bluntPercentReduction = DamageFilters.Sum( df => df.Value.bluntPercent );
-			bluntPercentReduction = Math.Abs( bluntPercentReduction );
-			bluntPercentReduction = Math.Min( 0.95F, bluntPercentReduction );
+			finalFilter.bluntPercent = DamageFilters.Sum( df => df.Value.bluntPercent );
+			finalFilter.bluntPercent = Math.Abs( finalFilter.bluntPercent );
+			finalFilter.bluntPercent = Math.Min( 0.95F, finalFilter.bluntPercent );
 			
-			piercingPercentReduction = DamageFilters.Sum( df => df.Value.piercingPercent );
-			piercingPercentReduction = Math.Abs( piercingPercentReduction );
-			piercingPercentReduction = Math.Min( 0.95F, piercingPercentReduction );
+			finalFilter.piercingPercent = DamageFilters.Sum( df => df.Value.piercingPercent );
+			finalFilter.piercingPercent = Math.Abs( finalFilter.piercingPercent );
+			finalFilter.piercingPercent = Math.Min( 0.95F, finalFilter.piercingPercent );
 						
-			slashingPercentReduction = DamageFilters.Sum( df => df.Value.slashingPercent );
-			slashingPercentReduction = Math.Abs( slashingPercentReduction );
-			slashingPercentReduction = Math.Min( 0.95F, slashingPercentReduction );
+			finalFilter.slashingPercent = DamageFilters.Sum( df => df.Value.slashingPercent );
+			finalFilter.slashingPercent = Math.Abs( finalFilter.slashingPercent );
+			finalFilter.slashingPercent = Math.Min( 0.95F, finalFilter.slashingPercent );
 							
-			crushingPercentReduction = DamageFilters.Sum( df => df.Value.crushingPercent );
-			crushingPercentReduction = Math.Abs( crushingPercentReduction );
-			crushingPercentReduction = Math.Min( 0.95F, crushingPercentReduction );
+			finalFilter.crushingPercent = DamageFilters.Sum( df => df.Value.crushingPercent );
+			finalFilter.crushingPercent = Math.Abs( finalFilter.crushingPercent );
+			finalFilter.crushingPercent = Math.Min( 0.95F, finalFilter.crushingPercent );
 			
-			firePercentReduction = DamageFilters.Sum( df => df.Value.firePercent );
-			firePercentReduction = Math.Abs( firePercentReduction );
-			firePercentReduction = Math.Min( 0.95F, firePercentReduction );			
+			finalFilter.firePercent = DamageFilters.Sum( df => df.Value.firePercent );
+			finalFilter.firePercent = Math.Abs( finalFilter.firePercent );
+			finalFilter.firePercent = Math.Min( 0.95F, finalFilter.firePercent );			
 			}
 		}
 

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

--- a/ArmourMod/assets/armourmod/lang/en.json
+++ b/ArmourMod/assets/armourmod/lang/en.json
@@ -1,11 +1,15 @@
-
-{
-    "armourmod:item-clothes-head-potmetal": "Metal Pot Helm",
-    "armourmod:item-clothes-upperbodyover-vest-studdedleather": "Studded Leather Vest",
-	"armourmod:item-clothes-upperbodyover-vest-scale": "Scale Mail Vest",
-	"armourmod:item-clothes-upperbodyover-vest-platechest": "Plate Armour Vest",
-	"armourmod:item-clothes-upperbodyover-vest-leather": "Leather Vest",
-	"armourmod:item-clothes-upperbodyover-vest-lamellar": "Lamellar Armour Vest",
-	"armourmod:item-clothes-upperbodyover-vest-coatofplates": "Coat'o'Plates Armour Vest",
-	"armourmod:item-clothes-upperbodyover-vest-chain": "Chainmail",
+{
+	"item:clothes-head-potmetal": "Metal Pot Helm",   
+	"item:clothes-upperbodyover-vest-studdedleather": "Studded Leather Vest",   
+	"item:clothes-upperbodyover-vest-scale": "Scale Mail Vest",   
+	"item:clothes-upperbodyover-vest-platechest": "Plate Armour Vest",   
+	"item:clothes-upperbodyover-vest-leather": "Leather Vest",   
+	"item:clothes-upperbodyover-vest-lamellar": "Lamellar Armour Vest",   
+	"item:clothes-upperbodyover-vest-coatofplates": "Coat'o'Plates Armour Vest",   
+	"item:clothes-upperbodyover-vest-chain": "Chainmail"  ,
+
+	"armourmod:item-clothes-upperbodyover-vest-leather": "2Leather Vest",
+	"armourmod:clothes-upperbodyover-vest-leather": "3Leather Vest",
+	"armourmod:item-upperbodyover-vest-leather": "4Leather Vest",
+
 }
\ No newline at end of file