Commit: 3ce516f1d434f89407a13fd3af8f22a584364cf8 - fma (git)

First Machine Age's Mods (Combined repo.)

Commit MetaInfo

• Révision: 3ce516f1d434f89407a13fd3af8f22a584364cf8 (tree)
• l'heure: 2022-08-30 07:17:17
• Auteur: melchior <melchior@user...>
• Commiter: melchior

Message de Log

Compat changes for 1.17

Change Summary

• modified: AnvilMetalRecovery/EntityBehaviors/HotbarObserverData.cs
• modified: AnvilMetalRecovery/MetalRecoverySystem.cs
• modified: AnvilMetalRecovery/MetalRecoverySystem_Components.cs
• modified: AnvilMetalRecovery/modinfo.json

Modification

--- a/AnvilMetalRecovery/EntityBehaviors/HotbarObserverData.cs
+++ b/AnvilMetalRecovery/EntityBehaviors/HotbarObserverData.cs
@@ -56,6 +56,13 @@ namespace AnvilMetalRecovery
 		{
 		throw new NotImplementedException( );
 		}
+
+		public IAttribute Clone( )
+		{
+		var newbie = new HotbarObserverData(this.InventoryID, this.Inventory_SlotID, this.ItemCode.Clone( ), this.PlayerUID);
+
+		return newbie;
+		}
 	}
 }
 

--- a/AnvilMetalRecovery/MetalRecoverySystem.cs
+++ b/AnvilMetalRecovery/MetalRecoverySystem.cs
@@ -39,7 +39,7 @@ namespace AnvilMetalRecovery
 		private RecoveryEntryTable itemToVoxelLookup = new RecoveryEntryTable();//Item Asset Code to: Ammount & Material
 
 		private ICoreAPI CoreAPI;
-		private ICoreServerAPI ServerAPI;
+
 		private ServerCoreAPI ServerCore { get; set; }
 		private ClientCoreAPI ClientCore { get; set; }
 
@@ -110,7 +110,18 @@ namespace AnvilMetalRecovery
 
 		RegisterItemMappings( );
 		RegisterBlockBehaviors( );
-		
+		if (api.Side.IsServer()) 
+			{
+			if (api is ServerCoreAPI) {
+				ServerCore = api as ServerCoreAPI;
+				}
+				ServerCore.Event.AssetsFinalizers += AttachExtraBlockBehaviors;
+			}
+		else 
+			{
+			ClientCore = api as ClientCoreAPI;
+			ClientCore.Event.LevelFinalize += PerformBlockClassSwaps;
+			}
 
 		#if DEBUG
 		//Harmony.DEBUG = true;
@@ -123,54 +134,38 @@ namespace AnvilMetalRecovery
 
 		public override void StartServerSide(ICoreServerAPI api)
 		{
-		this.ServerAPI = api;
 		
-
-		if (api is ServerCoreAPI) {
-		ServerCore = api as ServerCoreAPI;
-		}
-		else {
-		Mod.Logger.Error("Cannot access 'ServerCoreAPI' class:  API (implimentation) has changed, Contact Developer!");
-		return;
-		}
 		PrepareServersideConfig( );
 		PrepareDownlinkChannel( );
-		ServerAPI.Event.PlayerJoin += SendClientConfigMessage;
-		ServerAPI.Event.ServerRunPhase(EnumServerRunPhase.Shutdown, PersistServersideConfig);
-		ServerAPI.Event.ServerRunPhase(EnumServerRunPhase.GameReady, MaterialDataGathering);		
-		PerformBlockClassSwaps();
-		ServerAPI.Event.ServerRunPhase(EnumServerRunPhase.RunGame, CacheRecoveryDataTable);
-		ServerAPI.Event.ServerRunPhase(EnumServerRunPhase.GameReady, AttachExtraBlockBehaviors);
+		ServerCore.Event.PlayerJoin += SendClientConfigMessage;
+		ServerCore.Event.ServerRunPhase(EnumServerRunPhase.Shutdown, PersistServersideConfig);
+		ServerCore.Event.ServerRunPhase(EnumServerRunPhase.GameReady, MaterialDataGathering);				
+		ServerCore.Event.ServerRunPhase(EnumServerRunPhase.RunGame, CacheRecoveryDataTable);		
 
 		SetupGeneralObservers( );		
 
 		Mod.Logger.VerboseDebug("Anvil Metal Recovery - should be installed...");
 
 		#if DEBUG
-		ServerAPI.RegisterCommand("durability", "edit durability of item", " (Held tool) and #", EditDurability, Privilege.give);
+		ServerCore.RegisterCommand("durability", "edit durability of item", " (Held tool) and #", EditDurability, Privilege.give);
 		#endif
 					
 		}
 
 		public override void StartClientSide(ICoreClientAPI api)
 		{
-		base.StartClientSide(api);
-
-		if (api is ClientCoreAPI) {
-		ClientCore = api as ClientCoreAPI;
-		}
-		else {
-		Mod.Logger.Error("Cannot access 'ClientCoreAPI' class:  API (implimentation) has changed, Contact Developer!");
-		return;
-		}
+		base.StartClientSide(api);					
 		
-		ListenForServerConfigMessage( );
-		//ClientCore.Event.RegisterCallback(PerformBlockClassSwaps, 0);
-		PerformBlockClassSwaps();
+		ListenForServerConfigMessage( );				
 
 		Mod.Logger.VerboseDebug("Anvil Metal Recovery - should be installed...");
 		}
 
+		public override void AssetsLoaded(ICoreAPI api)
+		{
+		if (api.Side.IsServer( )) { PerformBlockClassSwaps( );}
+		}
+
 
 		private void RegisterItemMappings( )
 		{
@@ -189,6 +184,9 @@ namespace AnvilMetalRecovery
 
 		private void PerformBlockClassSwaps()
 		{
+		#if DEBUG
+		Mod.Logger.Debug("PerformBlockClassSwaps");
+		#endif
 		if (CoreAPI.Side == EnumAppSide.Server)
 			this.ServerCore.ClassRegistryNative.ReplaceBlockClassType(BlockWateringCanPlus.BlockClassName, typeof(BlockWateringCanPlus));
 		else
@@ -202,7 +200,7 @@ namespace AnvilMetalRecovery
 				new AssetLocation(@"game",@"toolmold-burned-*"),
 		};		
 
-		var moldRecoverBehaviorType = ServerAPI.ClassRegistry.GetBlockBehaviorClass(MoldDestructionRecovererBehavior.BehaviorClassName);
+		var moldRecoverBehaviorType = ServerCore.ClassRegistry.GetBlockBehaviorClass(MoldDestructionRecovererBehavior.BehaviorClassName);
 		foreach (var assetName in mold_behaviorsAppendList) {
 		if (!assetName.IsWildCard) 
 				{ 
@@ -212,7 +210,7 @@ namespace AnvilMetalRecovery
 				#endif
 				}
 			else {
-					var searchResults = ServerAPI.World.SearchBlocks(assetName);
+					var searchResults = ServerCore.World.SearchBlocks(assetName);
 					if (searchResults != null && searchResults.Length > 0) {
 					#if DEBUG
 					Mod.Logger.VerboseDebug("Attaching Block-Behaviors, wildcard matches from '{0}'", assetName);
@@ -237,14 +235,14 @@ namespace AnvilMetalRecovery
 
 		private void PrepareServersideConfig( )
 		{
-		AMRConfig config = ServerAPI.LoadModConfig<AMRConfig>(_configFilename);
+		AMRConfig config = ServerCore.LoadModConfig<AMRConfig>(_configFilename);
 
 		if (config == null) 
 			{
 			//Regen default
 			Mod.Logger.Warning("Regenerating default config as it was missing / unparsable...");
-			ServerAPI.StoreModConfig<AMRConfig>(new AMRConfig(true), _configFilename);
-			config = ServerAPI.LoadModConfig<AMRConfig>(_configFilename);
+			ServerCore.StoreModConfig<AMRConfig>(new AMRConfig(true), _configFilename);
+			config = ServerCore.LoadModConfig<AMRConfig>(_configFilename);
 			}
 			else if( config.BlackList == null || config.BlackList.Count == 0)
 			{
@@ -259,13 +257,13 @@ namespace AnvilMetalRecovery
 		{
 		if (this.CachedConfiguration != null) {
 		Mod.Logger.Notification("Persisting configuration.");
-		ServerAPI.StoreModConfig<AMRConfig>(this.CachedConfiguration, _configFilename);
+		ServerCore.StoreModConfig<AMRConfig>(this.CachedConfiguration, _configFilename);
 		}
 		}
 
 		private void PrepareDownlinkChannel( )
 		{
-		_ConfigDownlink = ServerAPI.Network.RegisterChannel(_configFilename);
+		_ConfigDownlink = ServerCore.Network.RegisterChannel(_configFilename);
 		_ConfigDownlink.RegisterMessageType<AMRConfig>( );
 		}
 
@@ -309,7 +307,7 @@ namespace AnvilMetalRecovery
 		#if DEBUG
 		Mod.Logger.VerboseDebug("Adding Recovery entries table to Cache...");
 		#endif
-		ServerAPI.ObjectCache.Add(itemFilterListCacheKey, itemToVoxelLookup);
+		ServerCore.ObjectCache.Add(itemFilterListCacheKey, itemToVoxelLookup);
 		}
 	}
 

--- a/AnvilMetalRecovery/MetalRecoverySystem_Components.cs
+++ b/AnvilMetalRecovery/MetalRecoverySystem_Components.cs
@@ -30,8 +30,8 @@ namespace AnvilMetalRecovery
 		continue;
 		}
 
-		CollectibleObject metalObject = recipie.Ingredient.Type == EnumItemClass.Item ? ServerAPI.World.GetItem(recipie.Ingredient.Code) : ServerAPI.World.GetBlock(recipie.Ingredient.Code) as CollectibleObject;
-		Item outputItem = ServerAPI.World.GetItem(recipie?.Output?.Code);
+		CollectibleObject metalObject = recipie.Ingredient.Type == EnumItemClass.Item ? ServerCore.World.GetItem(recipie.Ingredient.Code) : ServerCore.World.GetBlock(recipie.Ingredient.Code) as CollectibleObject;
+		Item outputItem = ServerCore.World.GetItem(recipie?.Output?.Code);
 
 		if (outputItem == null) {
 		#if DEBUG
@@ -69,9 +69,9 @@ namespace AnvilMetalRecovery
 		}
 		else {
 		//Tool-head map to Tool item; decode
-		var itemToolCode = ServerAPI.World.GridRecipes.FirstOrDefault(gr => gr.Ingredients.Any(crg => crg.Value.Code.Equals(outputItem.Code)) && gr.Enabled && gr.Output.Type == EnumItemClass.Item)?.Output.Code;
+		var itemToolCode = ServerCore.World.GridRecipes.FirstOrDefault(gr => gr.Ingredients.Any(crg => crg.Value.Code.Equals(outputItem.Code)) && gr.Enabled && gr.Output.Type == EnumItemClass.Item)?.Output.Code;
 		if (itemToolCode != null) {
-		var itemTool = ServerAPI.World.GetItem(itemToolCode);
+		var itemTool = ServerCore.World.GetItem(itemToolCode);
 		if (itemTool == null) {
 		#if DEBUG
 		Mod.Logger.Debug($"Missing Output Tool item, from: {recipie.Name.ToString( )}, skipping.");
@@ -133,7 +133,7 @@ namespace AnvilMetalRecovery
 		if (String.IsNullOrEmpty(hotbarData.PlayerUID) || String.IsNullOrEmpty(hotbarData.InventoryID)) return;
 
 		bool probablyHotbar = hotbarData.InventoryID.StartsWith(GlobalConstants.hotBarInvClassName, StringComparison.Ordinal);
-		var playerTarget = ServerAPI.World.PlayerByUid(hotbarData.PlayerUID);
+		var playerTarget = ServerCore.World.PlayerByUid(hotbarData.PlayerUID);
 		var spim = playerTarget.InventoryManager as ServerPlayerInventoryManager;												
 		var hotbarInv = playerTarget.InventoryManager.GetHotbarInventory( );
 		var hotSlot = hotbarInv[hotbarData.Inventory_SlotID];
@@ -144,11 +144,11 @@ namespace AnvilMetalRecovery
 			Mod.Logger.VerboseDebug("Directly inserting fragments into hotbar slot# {0}", hotbarData.Inventory_SlotID);
 			#endif
 
-			VariableMetalItem variableMetal = ServerAPI.World.GetItem(new AssetLocation(metalFragmentsCode)) as VariableMetalItem;
+			VariableMetalItem variableMetal = ServerCore.World.GetItem(new AssetLocation(metalFragmentsCode)) as VariableMetalItem;
 			ItemStack metalFragmentsStack = new ItemStack(variableMetal, 1);
 			variableMetal.ApplyMetalProperties(rec, ref metalFragmentsStack, CachedConfiguration.ToolRecoveryRate);
 			hotSlot.Itemstack = metalFragmentsStack;
-			hotSlot.Itemstack.ResolveBlockOrItem(ServerAPI.World);
+			hotSlot.Itemstack.ResolveBlockOrItem(ServerCore.World);
 			hotSlot.MarkDirty( );
 			spim.NotifySlot(playerTarget, hotSlot);
 			}							
@@ -158,13 +158,13 @@ namespace AnvilMetalRecovery
 			Mod.Logger.VerboseDebug("Hotbar-occupied (or crafting) slot#{0} so; shoving {1} in general direction of player...", hotbarData.Inventory_SlotID, hotbarData.ItemCode.ToShortString( ));
 			#endif
 
-			VariableMetalItem variableMetal = ServerAPI.World.GetItem(new AssetLocation(metalFragmentsCode)) as VariableMetalItem;
+			VariableMetalItem variableMetal = ServerCore.World.GetItem(new AssetLocation(metalFragmentsCode)) as VariableMetalItem;
 			ItemStack metalFragmentsStack = new ItemStack(variableMetal, 1);
 			variableMetal.ApplyMetalProperties(rec, ref metalFragmentsStack, CachedConfiguration.ToolRecoveryRate);
 				if (spim.TryGiveItemstack(metalFragmentsStack, true) == false) 
 					{
 					//Player with full Inv.
-					ServerAPI.World.SpawnItemEntity(metalFragmentsStack, playerTarget.Entity.Pos.XYZ);
+					ServerCore.World.SpawnItemEntity(metalFragmentsStack, playerTarget.Entity.Pos.XYZ);
 					}
 			}		
 		}
@@ -192,7 +192,7 @@ namespace AnvilMetalRecovery
 		private void ApplySmeltingPropertiesByCodeVariant(AssetLocation updatingCode, int ratioOverride = 1)
 		{
 		//ALL ????:'ingot-*' type items...
-		var ingotItems = ServerAPI.World.Items.Where(itm => itm.ItemId > 0 && itm.Code != null && itm.Code.BeginingOnly(@"ingot"));
+		var ingotItems = ServerCore.World.Items.Where(itm => itm.ItemId > 0 && itm.Code != null && itm.Code.BeginingOnly(@"ingot"));
 
 		#if DEBUG
 		this.Mod.Logger.VerboseDebug("found {0} Ingot type items", ingotItems.Count( ));
@@ -208,16 +208,16 @@ namespace AnvilMetalRecovery
 
 		metalSmeltProps.SmeltedRatio = ratioOverride;
 		AssetLocation shavingCode = updatingCode.AppendPathVariant(metalName);
-		var shavingEquivalentItem = ServerAPI.World.GetItem(shavingCode);
+		var shavingEquivalentItem = ServerCore.World.GetItem(shavingCode);
 		if (shavingEquivalentItem != null) {
 		shavingEquivalentItem.CombustibleProps = metalSmeltProps;
 		#if DEBUG
-		ServerAPI.Logger.VerboseDebug("Updated SmeltProps, for: {0}", shavingCode.ToString( ));
+		ServerCore.Logger.VerboseDebug("Updated SmeltProps, for: {0}", shavingCode.ToString( ));
 		#endif
 		}
 		else {
 		#if DEBUG
-		ServerAPI.Logger.VerboseDebug("Non-existant item: {0}", shavingCode.ToString( ));
+		ServerCore.Logger.VerboseDebug("Non-existant item: {0}", shavingCode.ToString( ));
 		#endif
 		}
 		}

--- a/AnvilMetalRecovery/modinfo.json
+++ b/AnvilMetalRecovery/modinfo.json
@@ -4,9 +4,9 @@
   "description" : "Get back smithing discards, broken tool scrap, failed molds; and MORE!",
   "authors": ["Melchior"],
   "ModID":"metalrecovery",
-  "version": "0.1.18-rc.1",
+  "version": "0.1.18-rc.2",
   "dependencies": { 
-	"game": "1.16.5",
+	"game": "1.17.0-rc.0",
 	"survival": ""
   },
   "website": "http://nowebsite.nope"