Syncing with upstream

Author: Balint66

.gitignore

@@ -5,3 +5,9 @@ obj/
 /packages/
 riderModule.iml
 /_ReSharper.Caches/
+
+/ExperimentalMod
+/ExperimentalMod/
+/ExperimentalMod/*
+/ExperimentalMod/*/*
+/ExperimentalMod/*/*/*

AdditionalMapSizesPlugin/AdditionalMapSizesPlugin.cs

@@ -32,11 +32,10 @@ public void update(MonoBehaviour root)
 
         public void start(MonoBehaviour root)
         {
-
+            add(create("16 x 16 - DEV", 16, 16, 16, 3));
             add(create("128 x 128", 128, 16, 128, 3));
             add(create("256 x 256", 256, 16, 256, 3));
             add(create("512 x 512", 512, 16, 512, 3));
-            
         }
 
         public MapSize create(string name, int width, int height, int length, int blockHeight = 3)

CameraSettingsPlusPlusPlugin/CameraSettingsPlusPlus.cs

@@ -23,6 +23,7 @@ public class CameraSettingsPlusPlus : IPlugin
         public void initialize()
         {
             activeState = true;
+
         }
 
         public void start(MonoBehaviour root)

GoingMedievalModLauncher.sln

@@ -12,6 +12,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AdditionalMapSizesPlugin",
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DummyPlugin", "DummyPlugin\DummyPlugin.csproj", "{7E2FAB97-5DB2-4683-A07D-3C35E5ED97C0}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ExperimentalMod", "ExperimentalMod\ExperimentalMod.csproj", "{AFB3E9BE-3087-4033-8B07-E5F18D99A25F}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -41,5 +43,9 @@ Global
 		{7E2FAB97-5DB2-4683-A07D-3C35E5ED97C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{7E2FAB97-5DB2-4683-A07D-3C35E5ED97C0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7E2FAB97-5DB2-4683-A07D-3C35E5ED97C0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AFB3E9BE-3087-4033-8B07-E5F18D99A25F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AFB3E9BE-3087-4033-8B07-E5F18D99A25F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AFB3E9BE-3087-4033-8B07-E5F18D99A25F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AFB3E9BE-3087-4033-8B07-E5F18D99A25F}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 EndGlobal

GoingMedievalModLauncher/src/ui/ModManagerLogWindow.cs

@@ -19,101 +19,43 @@ public class ModManagerLogWindow : UIWindow
 
         private string fileName = "mod_launcher.log";
 
+        private float calculatedMaxWindowHeight;
+        
         public void setup(string newFileName)
         {
             this.fileName = newFileName;
 
             // buildLog();
             logOutput.Clear();
             logOutput.Append(File.ReadAllText(this.fileName));
+
+            // count the number of newlines from the log and multiply it by the line height 
+            calculatedMaxWindowHeight = logOutput.ToString().Split('\n').Length * 16;
         }
 
         public new void Start()
         {
             this.windowTitle = "Going Medieval - Log";
             this.windowId = 2;
             this.windowRect = new Rect(20, 450, 800, 400);
-
-            // buildLog();
-            logOutput.Clear();
-            logOutput.Append(File.ReadAllText(this.fileName));
-            base.Start();
-
-
-            var manager = GameObject.FindObjectOfType<PromptPanelManager>();
-            var descf = typeof(PromptPanelManager).GetField("description", BindingFlags.Instance | BindingFlags
-            .NonPublic);
-            var desc = (MonoBehaviour) descf.GetValue(manager);
-            var components = desc.transform.parent.gameObject.GetComponents<MonoBehaviour>();
-            Logger.Instance.info("" + components);
-            Logger.Instance.info(sp.name);
-            foreach ( var component in components )
-            {
-                if ( component is Image i)
-                {
-                    Logger.Instance.info(i.sprite.texture.name);
-                }
-                else
-                {
-                    Logger.Instance.info(component.ToString());
-                }
-            }
-
+            this.shown = true;
+            
+            setup(this.fileName);
         }
 
         public override void renderContent()
         {
 
             // setup the scrollView dimensions based on the amount of loaded mods
             scrollViewRect.Set(1,20, windowRect.width-4, windowRect.height-2);
-            scrollContentMaxSize.Set(0,0, windowRect.width, 9999);
+            scrollContentMaxSize.Set(0,0, windowRect.width, calculatedMaxWindowHeight);
 
-            GUI.Label(new Rect(15, 30, windowRect.width - 10, windowRect.height - 10), logOutput.ToString());
+            GUI.Label(new Rect(15, 30, windowRect.width - 10, calculatedMaxWindowHeight), logOutput.ToString());
 
             // Make the windows be draggable.
             GUI.DragWindow(new Rect(0, 0, 10000, 10000));
         }
 
 
-        public void buildLog()
-        {
-            // clear the log
-            logOutput.Clear();
-
-            logOutput.AppendLine();
-
-            logOutput.Append("Game-Version: ");
-            logOutput.Append(Application.version);
-            logOutput.AppendLine();
-
-            logOutput.Append("Unity-Version: ");
-            logOutput.Append(Application.unityVersion);
-            logOutput.AppendLine();
-
-            logOutput.Append("Resolution: ");
-            logOutput.Append(Screen.width);
-            logOutput.Append(" x ");
-            logOutput.Append(Screen.height);
-            logOutput.Append(" @ ");
-            logOutput.Append(Screen.dpi);
-            logOutput.Append(" DPI");
-            logOutput.AppendLine();
-
-            logOutput.Append("Current level: ");
-            logOutput.Append(SceneManager.GetActiveScene().name);
-            logOutput.AppendLine();
-
-            logOutput.Append("Mouse-Position: ");
-            logOutput.Append(Input.mousePosition.ToString());
-            logOutput.AppendLine();
-
-            logOutput.Append("Real time:");
-            logOutput.Append(DateTime.Now.ToString("dd.MM.yyyy - HH:mm:ss"));
-            logOutput.AppendLine();
-
-            logOutput.Append("Frames per second:");
-            logOutput.Append((int) (1.0f / Time.smoothDeltaTime));
-            logOutput.AppendLine();
-        }
     }
 }

GoingMedievalModLauncher/src/ui/ModManagerWindow.cs

@@ -32,7 +32,7 @@ public ModManagerWindow()
         private void Update()
         {
 
-            if (Input.GetKeyDown(KeyCode.F1))
+            if (Input.GetKeyDown(KeyCode.F12))
             {
                 // toggle the visibility via key-press
                 shown = !shown;
@@ -67,7 +67,7 @@ public override void renderContent()
 
             // Render a simple note for using the mod-loader manager
             Rect usageLabelRect = new Rect(150, 10, 250, 30);
-            GUI.Label(usageLabelRect, "Toggle the Mod-Manager with F1.", bigFontSizeStyle);
+            GUI.Label(usageLabelRect, "Toggle the Mod-Manager with F12.", bigFontSizeStyle);
 
             // draw a line below the mod-log button and usage-note
             drawRect(new Rect(0, 40, windowRect.width , 2), lineColor );

docs/banner.xcf

@@ -1,16 +1,23 @@
 <img src="docs/banner.png">  
 
 # Going Medieval - Mod Loader & Plugin-API
-This project allows the development and loading of mods for Going Medieval, written in C#.
+This project allows the development and loading of mods for Going Medieval.
 
-The currently supported version is 0.5.28.6.
+**Note** \
+This project allows the modification of the gm runtime - this can lead to unexpected behaviour, errors or bugs. 
+Be aware of this - **I don't take any responsibility for any damage or corrupted files** - you are on your own now 🐱‍👤.
+
+Going Medieval is a product of the game development studio [Foxy Voxel](https://foxyvoxel.io/). All rights belong to them.
+This project uses [Harmony](https://harmony.pardeike.net/) and [Unity-Doorstop](https://github.com/NeighTools/UnityDoorstop). 
 
 ## Features
 The following features are supported by the Mod Launcher:
-- load C# based mods using a simple [Plugin-API](https://github.com/benjaminfoo/GoingMedievalModLauncher/blob/main/GoingMedievalModLauncher/src/plugins/IPlugin.cs)
-- access the native unity API / runtime
-- replace / patch methods by using [Harmony](https://harmony.pardeike.net/)
-- No manual editing / hacking of files - the games files don't get modified 
+- Current support for version 0.5.28.6
+- Load C# based mods using a simple [Plugin-API](https://github.com/benjaminfoo/GoingMedievalModLauncher/blob/main/GoingMedievalModLauncher/src/plugins/IPlugin.cs)
+- Access the native unity API / runtime
+- Replace / patch methods by using [Harmony](https://harmony.pardeike.net/)
+- No manual editing of files
+- Mod-Manager User Interface for enabling / disabling a mod  
 - Logging
  - ModLauncher / Plugin related logging within the 'mod_launcher.log' file
  - Unity related logging within the 'output_log' file
@@ -30,15 +37,21 @@ Increases rendering-, zoom- & shadow-distance - may slow down performance.
 [DeveloperConsole Enabler - Plugin](https://github.com/benjaminfoo/GoingMedievalModLauncher/tree/main/DeveloperConsoleEnablerPlugin)\
 Enables the Developer-Console by using L to open and K to close the UI.
 
-## Installation:
+### Installation
 Download the latest release and drop it into your going medieval folder
 
-## Technical
+### Technical
 
 For technical information checkout the [wiki](https://github.com/benjaminfoo/GoingMedievalModLauncher/wiki/Technical) at the github-page. 
 
-## Additional
-- Unity-Doorstop for injecting code: https://github.com/NeighTools/UnityDoorstop
-- Harmony for runtime patching of code: https://harmony.pardeike.net/
+### Screenshots
+<img src="docs/mod_manager.png">  
+<img src="docs/camsettingspp.png">  
+
+
+### Additional Information
+- [Going Medieval](https://foxyvoxel.io/) as this project's target 🐱‍💻
+- [Unity-Doorstop](https://github.com/NeighTools/UnityDoorstop) for injecting code 💉 
+- [Harmony](https://harmony.pardeike.net/) for runtime patching of code 🩹