Merge experimental fixes into main

Balint66 · Balint66 · commit 82491ca11bf2 · 2021-09-24T09:19:00.000+02:00
diff --git a/GoingMedievalModLauncher/GoingMedievalModLauncher.csproj b/GoingMedievalModLauncher/GoingMedievalModLauncher.csproj
@@ -22,7 +22,6 @@
     <ItemGroup>
         <Compile Include="Properties\AssemblyInfo.cs" />
         <Compile Include="src\buildings\BuildingBase.cs" />
-        <Compile Include="src\engine\DebbugingPatches.cs" />
         <Compile Include="src\engine\DynamicRepositoryBuilder.cs" />
         <Compile Include="src\engine\EngineLauncher.cs" />
         <Compile Include="src\engine\LocalizationControllerPatch.cs" />
@@ -51,13 +50,6 @@
     <ItemGroup>
       <Folder Include="dist\mods" />
     </ItemGroup>
-    <ItemGroup>
-      <None Include="packages.config" />
-    </ItemGroup>
-    <ItemGroup>
-        <PackageReference Include="NLog" Version="4.7.10" />
-        <PackageReference Include="Lib.Harmony" Version="2.1.0" />
-    </ItemGroup>
     <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
     <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
          Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/GoingMedievalModLauncher/dist/mods/0Harmony.dll b/GoingMedievalModLauncher/dist/mods/0Harmony.dll
diff --git a/GoingMedievalModLauncher/packages.config b/GoingMedievalModLauncher/packages.config
diff --git a/GoingMedievalModLauncher/src/Launcher.cs b/GoingMedievalModLauncher/src/Launcher.cs
@@ -10,6 +10,7 @@
 using HarmonyLib;
 using NSEipix.Base;
 using NSEipix.Repository;
+using NSMedieval;
 using NSMedieval.Almanac;
 using NSMedieval.Crops;
 using NSMedieval.GameEventSystem;
@@ -44,12 +45,12 @@ public static JsonRepository<T, M> getRepository<T, M>() where T : JsonRepositor
             where M : Model
         {
             object it = Repositories[typeof(T)];
-            if ( it as T == null )
+            if ( it is JsonRepository<T, M> repo )
             {
-                return null;
+                return repo;
             }
 
-            return it as JsonRepository<T, M>;
+            return null;
         }
 
         // the entry point of the code execution
@@ -64,11 +65,16 @@ private static void ReplaceComponent<T, M>(FieldInfo[] fieldToCopy = null)
             where T : JsonRepository<T, M>
             where M : Model
         {
+            var comp = Object.FindObjectOfType<T>();
+            if ( comp == null )
+            {
+                LOGGER.Info($"Unable to find component: {typeof(T).Name}");
+                return;
+            }
             TypeBuilder b = DynamicRepositoryBuilder<T, M>.GetTypeBuilder(
                 $"Patched_{typeof(T).Name}");
             DynamicRepositoryBuilder<T, M>.OverrideDeserialize(b);
             Type t = DynamicRepositoryBuilder<T, M>.CompileResultType(b);
-            var comp = Object.FindObjectOfType<T>();
             object[] variables = new object[0];
             if ( fieldToCopy != null )
             {
@@ -155,7 +161,7 @@ private static void Startup(Scene arg0, LoadSceneMode arg1)
             {
                 var harmony = new Harmony("com.modloader.nsmeadival");
                     
-                DebbugingPatches.ApplyPatches(harmony);
+                //DebbugingPatches.ApplyPatches(harmony);
                 MainMenuPatch.ApplyPatch(harmony);
                 RoomTypePatch.ApplyPatch(harmony);
                 LocalizationControllerPatch.ApplyPatch(harmony);
@@ -173,7 +179,7 @@ private static void Startup(Scene arg0, LoadSceneMode arg1)
 
                 LOGGER.Info("Mod-loader is running ...");
                 
-                Singleton<PluginManager>.Instance.loadAssemblies();
+                Singleton<PluginManager>.Instance.LoadAssemblies();
 
                 // create a gameObject which we can use as a root reference to the scene-graph
                 var modLoaderObject = new GameObject {name = "ModLoader"};
@@ -189,6 +195,8 @@ private static void Startup(Scene arg0, LoadSceneMode arg1)
                 throw;
             }
             //For replacements that are required before the game map
+            ReplaceComponent<MapRepository, Map>();
+            LOGGER.Info("The Maptype repository was replaced with a patched one.");
             ReplaceComponent<MapSizeRepository, MapSize>();
             LOGGER.Info("The Mapsize repository was replaced with a patched one.");
             ReplaceComponent<VillageNameRepository, VillageNames>();
diff --git a/GoingMedievalModLauncher/src/MonoScripts/BarrelBuildableView.cs b/GoingMedievalModLauncher/src/MonoScripts/BarrelBuildableView.cs
@@ -6,6 +6,10 @@
 
 namespace GoingMedievalModLauncher.MonoScripts
 {
+	
+	/// <summary>
+	/// An example class to add buildable objects. WIP
+	/// </summary>
 	public class BarrelBuildableView : BaseBuildableView<BuildingInstance>, IHideObject
 	{
 
diff --git a/GoingMedievalModLauncher/src/engine/EngineLauncher.cs b/GoingMedievalModLauncher/src/engine/EngineLauncher.cs
@@ -11,8 +11,11 @@ namespace GoingMedievalModLauncher.Engine
     
     // The EngineLauncher gets loads any provided mod from the /mods directory and instantiates the lifecycle of each
     // plugin within the unity-engine.
-    public class EngineLauncher : MonoBehaviour
+    public class EngineLauncher : MonoSingleton<EngineLauncher>
     {
+
+        public ModManagerWindow modManagerWindow = null;
+        
         public void Awake()
         {
 
@@ -22,7 +25,7 @@ public void Awake()
             t.Field("suffix").SetValue(" - mods active");
             t.Method("Start").GetValue();
 
-            // dont destroy the engines object when loading another scene, etc.
+            // don't destroy the engines object when loading another scene, etc.
             DontDestroyOnLoad(this);
 
             // Load all the mods / plugins / assemblies from the mods directory
@@ -40,7 +43,7 @@ public void Awake()
 
             // Show a fancy ui to display and control every loaded mod at runtime
             Launcher.LOGGER.Info("Showing mod-manager window...");
-            var modManagerWindow = gameObject.AddComponent<ModManagerWindow>();
+            modManagerWindow = gameObject.AddComponent<ModManagerWindow>();
 
         }
 
diff --git a/GoingMedievalModLauncher/src/engine/LocalizationControllerPatch.cs b/GoingMedievalModLauncher/src/engine/LocalizationControllerPatch.cs
@@ -10,7 +10,7 @@ public static class LocalizationControllerPatch
 
 		private static void GetTextPre(ref string key)
 		{
-			if ( key.Contains(":") )
+			if ( key != null && key.Contains(":") )
 			{
 				var modS = key.Split('#', ':');
 				if ( modS.Length == 3 )
diff --git a/GoingMedievalModLauncher/src/plugins/PluginComponent.cs b/GoingMedievalModLauncher/src/plugins/PluginComponent.cs
@@ -2,7 +2,7 @@
 
 namespace GoingMedievalModLauncher.plugins
 {
-    // The PluginComponent is a simple monobehavior which contains a reference to an IPlugin-Instance - 
+    // The PluginComponent is a simple monobehavior which contains a reference to an IPluginContainer-Instance - 
     // this way, a plugin / mod can make use of the native lifecycle of an object within the unity-engine.
     //
     // See the IPluginContainer-Class for more detailed information about each method.
diff --git a/GoingMedievalModLauncher/src/plugins/PluginContainer.cs b/GoingMedievalModLauncher/src/plugins/PluginContainer.cs
@@ -5,11 +5,13 @@
 using System.Reflection;
 using GoingMedievalModLauncher.Engine;
 using GoingMedievalModLauncher.MonoScripts;
+using GoingMedievalModLauncher.ui;
 using I2.Loc;
 using Newtonsoft.Json;
 using NSEipix.Base;
 using NSEipix.ObjectMapper;
 using NSEipix.Repository;
+using NSMedieval;
 using NSMedieval.Construction;
 using NSMedieval.Crops;
 using NSMedieval.Model;
@@ -98,6 +100,9 @@ ContainerState State
 		/// </summary>
 		bool CodeOnly { get; }
 		
+		/// <summary>
+		/// Indicates that the launcher should not search in the code directory
+		/// </summary>
 		bool NoCode { get; }
 
 		void Init();
@@ -165,14 +170,13 @@ public ContainerState State
 			}
 		}
 
-		public bool NoCode { get; }
-
 		/// <summary>
 		/// The backing variable of the State property.
 		/// </summary>
 		private ContainerState _state;
 		
 		public bool CodeOnly { get; }
+		public bool NoCode { get; }
 
 		private event Action<MonoBehaviour> OnDeinit;
 		private event Action OnInit;
@@ -217,6 +221,7 @@ private PluginContainer(DirectoryInfo path, ManifestClass manifest)
 			
 			if ( !CodeOnly )
 			{
+				RegisterJsonRepositoryLoader<MapRepository, Map>();
 				RegisterJsonRepositoryLoader<MapSizeRepository, MapSize>();
 
 				RegisterJsonRepositoryLoaderWithIdField<ResourceRepository, Resource>("resourceId");
@@ -240,7 +245,7 @@ private PluginContainer(DirectoryInfo path, ManifestClass manifest)
 					assemblies.Add(assembly);
 				}
 				
-				// Check if the assembly is valid (we don't want to load any dll within the mods-directory
+				// Check if the assembly is valid (we don't want to load any dll within the mods-directory)
 				Type pluginType = typeof(IPlugin);
 				List<Type> validPlugins = new List<Type>();
 				
@@ -250,7 +255,7 @@ private PluginContainer(DirectoryInfo path, ManifestClass manifest)
 					{
 						if ( assembly != null )
 						{
-							Type[] types = new Type[0];
+							Type[] types = Type.EmptyTypes;
 							try
 							{
 								types = assembly.GetTypes();
@@ -287,12 +292,11 @@ private PluginContainer(DirectoryInfo path, ManifestClass manifest)
 				}
 				catch (Exception e)
 				{
-					Launcher.LOGGER.Info("Unable to get Plugin's type. Maybe the code is referencing an older launcher?");
-					Launcher.LOGGER.Info(e.ToString());
-					
+					Launcher.LOGGER.Error(e,
+						"Unable to get Plugin's type. Maybe the code is referencing an older launcher?");
 				}
 
-				//TODO: more erros?
+				//TODO: more errors?
 				if ( validPlugins.Count == 0 )
 				{
 					Launcher.LOGGER.Info("No valid plugin were found for this directory.");
@@ -320,7 +324,7 @@ void I()
 							}
 							catch (Exception e)
 							{
-								Launcher.LOGGER.Info($"Unable to initalize plugin {Name}: {e}");
+								Launcher.LOGGER.Error(e,$"Unable to initalize plugin {Name}");
 							}
 						}
 
@@ -329,11 +333,11 @@ void D(MonoBehaviour o)
 							try
 							{
 								instance.disable(o);
-								// TODO:  plugin.start(doorstepGameObject);
+								// TODO:  plugin.stop(doorstepGameObject);
 							}
 							catch (Exception e)
 							{
-								Launcher.LOGGER.Info($"Unable to disbale plugin {Name}: {e}");
+								Launcher.LOGGER.Error(e,$"Unable to disbale plugin {Name}");
 							}
 						}
 
@@ -342,7 +346,7 @@ void D(MonoBehaviour o)
 					}
 					catch (Exception e)
 					{
-						Launcher.LOGGER.Info("An error happened instantiating a plugin!\n" + e);
+						Launcher.LOGGER.Error(e,"An error happened instantiating a plugin!\n");
 					}
 					finally
 					{
@@ -525,8 +529,9 @@ void Del(T repo)
 							Launcher.LOGGER.Info($"Added item {item.GetID()} to repository {typeof(T).Name}");
 							repo.Add(item);
 						}
-
-						repo.Reload();
+						
+						//DO NOT! RECURSION ALERT!
+						//repo.Reload();
 					}
 
 				}
@@ -711,7 +716,19 @@ public void Deinit(MonoBehaviour o)
 			
 		}
 
-		private ModLoaderPluginContainer(){}
+		private ModLoaderPluginContainer()
+		{
+			MainMenuPatch.OnMenuStartPost += () =>
+			{
+				MainMenuPatch.AddMainMenuButton("ModsButton", "Mods", () =>
+				{
+					if(EngineLauncher.Instance.modManagerWindow == null) return;
+
+					EngineLauncher.Instance.modManagerWindow.shown = !EngineLauncher.Instance.modManagerWindow.shown;
+					
+				}, 15);
+			};
+		}
 
 	}
 
diff --git a/GoingMedievalModLauncher/src/plugins/PluginManager.cs b/GoingMedievalModLauncher/src/plugins/PluginManager.cs
@@ -24,7 +24,7 @@ public ICollection<PluginContainer> GetPlugins()
         /**
          * Loads all assemblies by a given path
          */
-        public ICollection<PluginContainer> loadAssemblies()
+        public ICollection<PluginContainer> LoadAssemblies()
         {
             // The directory where all assemblies / plugins / mods have to be stored
             DirectoryInfo dir = new DirectoryInfo(@"./mods");
@@ -65,14 +65,13 @@ private void ValidateRequirements()
                     var p = pc.ToList();
                     foreach ( var container in p )
                     {
-                        if ( leaf.value.ID == container.Requirement )
-                        {
-                            tree.Add(new PluginTree.TreeNode(leaf, container));
-                            pc.Remove(container);
-                        }
+                        if ( leaf.value.ID != container.Requirement ) continue;
+
+                        tree.Add(new PluginTree.TreeNode(leaf, container));
+                        pc.Remove(container);
                     }
                 }
-            } while ( leaves.Equals(tree.leaves));
+            } while ( !leaves.Equals(tree.leaves));
 
             foreach ( PluginContainer container in pc )
             {
diff --git a/GoingMedievalModLauncher/src/ui/MainMenuPatch.cs b/GoingMedievalModLauncher/src/ui/MainMenuPatch.cs
diff --git a/Props/references.common.props b/Props/references.common.props

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,10 @@`
`6`	`6`
`7`	`7`	`namespace GoingMedievalModLauncher.MonoScripts`
`8`	`8`	`{`
	`9`	`+`
	`10`	`+ /// <summary>`
	`11`	`+ /// An example class to add buildable objects. WIP`
	`12`	`+ /// </summary>`
`9`	`13`	`public class BarrelBuildableView : BaseBuildableView<BuildingInstance>, IHideObject`
`10`	`14`	`{`
`11`	`15`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ public static class LocalizationControllerPatch`
`10`	`10`
`11`	`11`	`private static void GetTextPre(ref string key)`
`12`	`12`	`{`
`13`		`- if ( key.Contains(":") )`
	`13`	`+ if ( key != null && key.Contains(":") )`
`14`	`14`	`{`
`15`	`15`	`var modS = key.Split('#', ':');`
`16`	`16`	`if ( modS.Length == 3 )`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`namespace GoingMedievalModLauncher.plugins`
`4`	`4`	`{`
`5`		`- // The PluginComponent is a simple monobehavior which contains a reference to an IPlugin-Instance -`
	`5`	`+ // The PluginComponent is a simple monobehavior which contains a reference to an IPluginContainer-Instance -`
`6`	`6`	`// this way, a plugin / mod can make use of the native lifecycle of an object within the unity-engine.`
`7`	`7`	`//`
`8`	`8`	`// See the IPluginContainer-Class for more detailed information about each method.`
Original file line number	Diff line number	Diff line change
`@@ -5,11 +5,13 @@`
`5`	`5`	`using System.Reflection;`
`6`	`6`	`using GoingMedievalModLauncher.Engine;`
`7`	`7`	`using GoingMedievalModLauncher.MonoScripts;`
	`8`	`+using GoingMedievalModLauncher.ui;`
`8`	`9`	`using I2.Loc;`
`9`	`10`	`using Newtonsoft.Json;`
`10`	`11`	`using NSEipix.Base;`
`11`	`12`	`using NSEipix.ObjectMapper;`
`12`	`13`	`using NSEipix.Repository;`
	`14`	`+using NSMedieval;`
`13`	`15`	`using NSMedieval.Construction;`
`14`	`16`	`using NSMedieval.Crops;`
`15`	`17`	`using NSMedieval.Model;`
`@@ -98,6 +100,9 @@ ContainerState State`
`98`	`100`	`/// </summary>`
`99`	`101`	`bool CodeOnly { get; }`
`100`	`102`
	`103`	`+ /// <summary>`
	`104`	`+ /// Indicates that the launcher should not search in the code directory`
	`105`	`+ /// </summary>`
`101`	`106`	`bool NoCode { get; }`
`102`	`107`
`103`	`108`	`void Init();`
`@@ -165,14 +170,13 @@ public ContainerState State`
`165`	`170`	`}`
`166`	`171`	`}`
`167`	`172`
`168`		`- public bool NoCode { get; }`
`169`		`-`
`170`	`173`	`/// <summary>`
`171`	`174`	`/// The backing variable of the State property.`
`172`	`175`	`/// </summary>`
`173`	`176`	`private ContainerState _state;`
`174`	`177`
`175`	`178`	`public bool CodeOnly { get; }`
	`179`	`+ public bool NoCode { get; }`
`176`	`180`
`177`	`181`	`private event Action<MonoBehaviour> OnDeinit;`
`178`	`182`	`private event Action OnInit;`
`@@ -217,6 +221,7 @@ private PluginContainer(DirectoryInfo path, ManifestClass manifest)`
`217`	`221`
`218`	`222`	`if ( !CodeOnly )`
`219`	`223`	`{`
	`224`	`+ RegisterJsonRepositoryLoader<MapRepository, Map>();`
`220`	`225`	`RegisterJsonRepositoryLoader<MapSizeRepository, MapSize>();`
`221`	`226`
`222`	`227`	`RegisterJsonRepositoryLoaderWithIdField<ResourceRepository, Resource>("resourceId");`
`@@ -240,7 +245,7 @@ private PluginContainer(DirectoryInfo path, ManifestClass manifest)`
`240`	`245`	`assemblies.Add(assembly);`
`241`	`246`	`}`
`242`	`247`
`243`		`- // Check if the assembly is valid (we don't want to load any dll within the mods-directory`
	`248`	`+ // Check if the assembly is valid (we don't want to load any dll within the mods-directory)`
`244`	`249`	`Type pluginType = typeof(IPlugin);`
`245`	`250`	`List<Type> validPlugins = new List<Type>();`
`246`	`251`
`@@ -250,7 +255,7 @@ private PluginContainer(DirectoryInfo path, ManifestClass manifest)`
`250`	`255`	`{`
`251`	`256`	`if ( assembly != null )`
`252`	`257`	`{`
`253`		`- Type[] types = new Type[0];`
	`258`	`+ Type[] types = Type.EmptyTypes;`
`254`	`259`	`try`
`255`	`260`	`{`
`256`	`261`	`types = assembly.GetTypes();`
`@@ -287,12 +292,11 @@ private PluginContainer(DirectoryInfo path, ManifestClass manifest)`
`287`	`292`	`}`
`288`	`293`	`catch (Exception e)`
`289`	`294`	`{`
`290`		`- Launcher.LOGGER.Info("Unable to get Plugin's type. Maybe the code is referencing an older launcher?");`
`291`		`- Launcher.LOGGER.Info(e.ToString());`
`292`		`-`
	`295`	`+ Launcher.LOGGER.Error(e,`
	`296`	`+ "Unable to get Plugin's type. Maybe the code is referencing an older launcher?");`
`293`	`297`	`}`
`294`	`298`
`295`		`- //TODO: more erros?`
	`299`	`+ //TODO: more errors?`
`296`	`300`	`if ( validPlugins.Count == 0 )`
`297`	`301`	`{`
`298`	`302`	`Launcher.LOGGER.Info("No valid plugin were found for this directory.");`
`@@ -320,7 +324,7 @@ void I()`
`320`	`324`	`}`
`321`	`325`	`catch (Exception e)`
`322`	`326`	`{`
`323`		`- Launcher.LOGGER.Info($"Unable to initalize plugin {Name}: {e}");`
	`327`	`+ Launcher.LOGGER.Error(e,$"Unable to initalize plugin {Name}");`
`324`	`328`	`}`
`325`	`329`	`}`
`326`	`330`
`@@ -329,11 +333,11 @@ void D(MonoBehaviour o)`
`329`	`333`	`try`
`330`	`334`	`{`
`331`	`335`	`instance.disable(o);`
`332`		`- // TODO: plugin.start(doorstepGameObject);`
	`336`	`+ // TODO: plugin.stop(doorstepGameObject);`
`333`	`337`	`}`
`334`	`338`	`catch (Exception e)`
`335`	`339`	`{`
`336`		`- Launcher.LOGGER.Info($"Unable to disbale plugin {Name}: {e}");`
	`340`	`+ Launcher.LOGGER.Error(e,$"Unable to disbale plugin {Name}");`
`337`	`341`	`}`
`338`	`342`	`}`
`339`	`343`
`@@ -342,7 +346,7 @@ void D(MonoBehaviour o)`
`342`	`346`	`}`
`343`	`347`	`catch (Exception e)`
`344`	`348`	`{`
`345`		`- Launcher.LOGGER.Info("An error happened instantiating a plugin!\n" + e);`
	`349`	`+ Launcher.LOGGER.Error(e,"An error happened instantiating a plugin!\n");`
`346`	`350`	`}`
`347`	`351`	`finally`
`348`	`352`	`{`
`@@ -525,8 +529,9 @@ void Del(T repo)`
`525`	`529`	`Launcher.LOGGER.Info($"Added item {item.GetID()} to repository {typeof(T).Name}");`
`526`	`530`	`repo.Add(item);`
`527`	`531`	`}`
`528`		`-`
`529`		`- repo.Reload();`
	`532`	`+`
	`533`	`+ //DO NOT! RECURSION ALERT!`
	`534`	`+ //repo.Reload();`
`530`	`535`	`}`
`531`	`536`
`532`	`537`	`}`
`@@ -711,7 +716,19 @@ public void Deinit(MonoBehaviour o)`
`711`	`716`
`712`	`717`	`}`
`713`	`718`
`714`		`- private ModLoaderPluginContainer(){}`
	`719`	`+ private ModLoaderPluginContainer()`
	`720`	`+ {`
	`721`	`+ MainMenuPatch.OnMenuStartPost += () =>`
	`722`	`+ {`
	`723`	`+ MainMenuPatch.AddMainMenuButton("ModsButton", "Mods", () =>`
	`724`	`+ {`
	`725`	`+ if(EngineLauncher.Instance.modManagerWindow == null) return;`
	`726`	`+`
	`727`	`+ EngineLauncher.Instance.modManagerWindow.shown = !EngineLauncher.Instance.modManagerWindow.shown;`
	`728`	`+`
	`729`	`+ }, 15);`
	`730`	`+ };`
	`731`	`+ }`
`715`	`732`
`716`	`733`	`}`
`717`	`734`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ public ICollection<PluginContainer> GetPlugins()`
`24`	`24`	`/**`
`25`	`25`	`* Loads all assemblies by a given path`
`26`	`26`	`*/`
`27`		`- public ICollection<PluginContainer> loadAssemblies()`
	`27`	`+ public ICollection<PluginContainer> LoadAssemblies()`
`28`	`28`	`{`
`29`	`29`	`// The directory where all assemblies / plugins / mods have to be stored`
`30`	`30`	`DirectoryInfo dir = new DirectoryInfo(@"./mods");`
`@@ -65,14 +65,13 @@ private void ValidateRequirements()`
`65`	`65`	`var p = pc.ToList();`
`66`	`66`	`foreach ( var container in p )`
`67`	`67`	`{`
`68`		`- if ( leaf.value.ID == container.Requirement )`
`69`		`- {`
`70`		`- tree.Add(new PluginTree.TreeNode(leaf, container));`
`71`		`- pc.Remove(container);`
`72`		`- }`
	`68`	`+ if ( leaf.value.ID != container.Requirement ) continue;`
	`69`	`+`
	`70`	`+ tree.Add(new PluginTree.TreeNode(leaf, container));`
	`71`	`+ pc.Remove(container);`
`73`	`72`	`}`
`74`	`73`	`}`
`75`		`- } while ( leaves.Equals(tree.leaves));`
	`74`	`+ } while ( !leaves.Equals(tree.leaves));`
`76`	`75`
`77`	`76`	`foreach ( PluginContainer container in pc )`
`78`	`77`	`{`