Fixed an issue

Repaired the git history, no one let me code at 4 am anymore, please.
itsjohncs · Mar 7, 2021 · d321144 · d321144
1 parent 74cdff0
commit d321144
Show file tree

Hide file tree

Showing 60 changed files with 47 additions and 40 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,2 @@
 *.sln
-*.csproj
-*.xml
-*.dll
+*.xml
diff --git a/GrassyKnight.csproj b/GrassyKnight.csproj
@@ -33,7 +33,7 @@
   <ItemGroup>
     <Reference Include="Assembly-CSharp">
       <HintPath>..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\Hollow Knight\hollow_knight_Data\Managed\Assembly-CSharp.dll</HintPath>
-      <HintPath>/Users/johnsullivan/Library/Application Support/Steam/steamapps/common/Hollow Knight/hollow_knight.app/Contents/Resources/Data/Managed/Assembly-CSharp.dll</HintPath>
+      <HintPath>..\..\..\Desktop\Hollow Knight\hollow_knight_Data\Managed\Assembly-CSharp.dll</HintPath>
     </Reference>
     <Reference Include="System">
       <HintPath>/Users/johnsullivan/Library/Application Support/Steam/steamapps/common/Hollow Knight/hollow_knight.app/Contents/Resources/Data/Managed/System.dll</HintPath>
@@ -46,29 +46,32 @@
     </Reference>
     <Reference Include="UnityEngine">
       <HintPath>..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\Hollow Knight\hollow_knight_Data\Managed\UnityEngine.dll</HintPath>
-      <HintPath>/Users/johnsullivan/Library/Application Support/Steam/steamapps/common/Hollow Knight/hollow_knight.app/Contents/Resources/Data/Managed/UnityEngine.dll</HintPath>
+      <HintPath>..\..\..\Desktop\Hollow Knight\hollow_knight_Data\Managed\UnityEngine.dll</HintPath>
     </Reference>
     <Reference Include="UnityEngine.CoreModule">
       <HintPath>..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\Hollow Knight\hollow_knight_Data\Managed\UnityEngine.CoreModule.dll</HintPath>
-      <HintPath>/Users/johnsullivan/Library/Application Support/Steam/steamapps/common/Hollow Knight/hollow_knight.app/Contents/Resources/Data/Managed/UnityEngine.CoreModule.dll</HintPath>
+      <HintPath>..\..\..\Desktop\Hollow Knight\hollow_knight_Data\Managed\UnityEngine.CoreModule.dll</HintPath>
     </Reference>
     <Reference Include="UnityEngine.TextRenderingModule">
       <HintPath>..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\Hollow Knight\hollow_knight_Data\Managed\UnityEngine.TextRenderingModule.dll</HintPath>
-      <HintPath>/Users/johnsullivan/Library/Application Support/Steam/steamapps/common/Hollow Knight/hollow_knight.app/Contents/Resources/Data/Managed/UnityEngine.TextRenderingModule.dll</HintPath>
+      <HintPath>..\..\..\Desktop\Hollow Knight\hollow_knight_Data\Managed\UnityEngine.TextRenderingModule.dll</HintPath>
     </Reference>
     <Reference Include="UnityEngine.Physics2DModule, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\Hollow Knight\hollow_knight_Data\Managed\UnityEngine.Physics2DModule.dll</HintPath>
-      <HintPath>/Users/johnsullivan/Library/Application Support/Steam/steamapps/common/Hollow Knight/hollow_knight.app/Contents/Resources/Data/Managed/UnityEngine.Physics2DModule.dll</HintPath>
+      <HintPath>..\..\..\Desktop\Hollow Knight\hollow_knight_Data\Managed\UnityEngine.Physics2DModule.dll</HintPath>
     </Reference>
     <Reference Include="UnityEngine.UI">
       <HintPath>..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\Hollow Knight\hollow_knight_Data\Managed\UnityEngine.UI.dll</HintPath>
-      <HintPath>/Users/johnsullivan/Library/Application Support/Steam/steamapps/common/Hollow Knight/hollow_knight.app/Contents/Resources/Data/Managed/UnityEngine.UI.dll</HintPath>
+      <HintPath>..\..\..\Desktop\Hollow Knight\hollow_knight_Data\Managed\UnityEngine.UI.dll</HintPath>
+    </Reference>
+    <Reference Include="UnityEngine.UIElementsModule">
+      <HintPath>..\..\..\Desktop\Hollow Knight\hollow_knight_Data\Managed\UnityEngine.UIElementsModule.dll</HintPath>
     </Reference>
     <Reference Include="UnityEngine.UIModule, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\Hollow Knight\hollow_knight_Data\Managed\UnityEngine.UIModule.dll</HintPath>
-      <HintPath>/Users/johnsullivan/Library/Application Support/Steam/steamapps/common/Hollow Knight/hollow_knight.app/Contents/Resources/Data/Managed/UnityEngine.UIModule.dll</HintPath>
+      <HintPath>..\..\..\Desktop\Hollow Knight\hollow_knight_Data\Managed\UnityEngine.UIModule.dll</HintPath>
     </Reference>
     <Reference Include="UnityEngine.PhysicsModule, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -95,4 +98,4 @@
   <PropertyGroup>
     <PostBuildEvent>cp "$(TargetPath)" "/Users/johnsullivan/Library/Application Support/Steam/steamapps/common/Hollow Knight/hollow_knight.app/Contents/Resources/Data/Managed/Mods/"</PostBuildEvent>
   </PropertyGroup>
-</Project>
+</Project>
diff --git a/GrassyKnight.dll b/GrassyKnight.dll
diff --git a/StatusBar.cs b/StatusBar.cs
@@ -4,20 +4,27 @@
 
 namespace GrassyKnight
 {
-    class StatusBar {
-        private const int _FONT_SIZE = 21;
-        private const int _MARGIN_TOP = 10;
+    class StatusBar
+    {
+        // If non-null, this'll be used as the global total regardless of what
+        // GrassStats values are given.
+        public int? GlobalTotalOverride = null;
+
+        private const int _FONT_SIZE = 36;
+        private const int _MARGIN_TOP = 20;
 
         private GameObject _canvas;
         private GameObject _textOnCanvas;
 
-        public bool Visible {
+        public bool Visible
+        {
             get => _canvas.GetComponent<Canvas>().enabled;
             set => _canvas.GetComponent<Canvas>().enabled = value;
         }
 
-        public StatusBar() {
-            _canvas = new GameObject("GrassyKnight StatusBar Canvas",
+        public StatusBar()
+        {
+            _canvas = new GameObject("GrassPls StatusBar Canvas",
                                      typeof(Canvas));
             UnityEngine.Object.DontDestroyOnLoad(_canvas);
 
@@ -27,51 +34,49 @@ public StatusBar() {
             canvasComponent.enabled = false;
 
             _textOnCanvas = new GameObject(
-                "GrassyKnight StatusBar",
+                "GrassPls StatusBar",
                 typeof(Text),
                 typeof(CanvasRenderer));
             UnityEngine.Object.DontDestroyOnLoad(_textOnCanvas);
             _textOnCanvas.transform.parent = canvasComponent.transform;
             _textOnCanvas.transform.localPosition =
                 new Vector3(
-                    0,
-                    // Aligns the vertical center to top of screen
-                    canvasComponent.pixelRect.height / 2
-                        // Adjusts downwards so top of text is now along top
-                        // of screen.
-                        - _FONT_SIZE / 2
-                        // Finally some margin space to taste. uwu.
-                        - _MARGIN_TOP,
+                    -1 * canvasComponent.pixelRect.width / 2.5f + _FONT_SIZE / 3.25f,
+                    canvasComponent.pixelRect.height / 3.25f - _FONT_SIZE / 2 - _MARGIN_TOP,
                     0);
-
             Text textComponent = _textOnCanvas.GetComponent<Text>();
             textComponent.font = Modding.CanvasUtil.TrajanBold;
-            textComponent.text = "Loading GrassyKnight...";
+            textComponent.text = "Loading GrassPls...";
             textComponent.fontSize = _FONT_SIZE;
             textComponent.alignment = TextAnchor.MiddleCenter;
             textComponent.horizontalOverflow = HorizontalWrapMode.Overflow;
         }
 
-        private string PrettyStats(GrassStats stats) {
+        private string PrettyStats(GrassStats stats, int? totalOverride = null)
+        {
             int struck = stats[GrassState.Cut] + stats[GrassState.ShouldBeCut];
-            string result =  $"{struck}/{stats.Total()}";
-            if (stats[GrassState.ShouldBeCut] > 0) {
-                result += $" ({stats[GrassState.ShouldBeCut]} shameful)";
-            }
+            string result = $"{struck}/{totalOverride ?? stats.Total()}";
             return result;
         }
 
-        public void Update(GrassStats scene, GrassStats global) {
+        public void Update(GrassStats scene, GrassStats global)
+        {
             string statusText = "";
 
-            if (scene == null) {
-                statusText += $"(not in a room) ";
-            } else {
-                statusText += $"in room: {PrettyStats(scene)} ";
+            if (scene == null)
+            {
+                statusText += $"Pls...";
+            }
+            else if (scene[GrassState.Cut] + scene[GrassState.ShouldBeCut] - scene.Total() == 0)
+            {
+                statusText += $"—  ";
+            }
+            else
+            {
+                statusText += $"{PrettyStats(scene)} ";
             }
 
-            statusText += $"-- globally: {PrettyStats(global)}";
-
+            statusText += $"\n{PrettyStats(global, GlobalTotalOverride)} ";
             _textOnCanvas.GetComponent<Text>().text = statusText;
         }
     }

diff --git a/bin/Debug/Assembly-CSharp-firstpass.dll b/bin/Debug/Assembly-CSharp-firstpass.dll
diff --git a/bin/Debug/Assembly-CSharp.dll b/bin/Debug/Assembly-CSharp.dll
diff --git a/bin/Debug/GrassyKnight.dll b/bin/Debug/GrassyKnight.dll
diff --git a/bin/Debug/GrassyKnight.pdb b/bin/Debug/GrassyKnight.pdb
diff --git a/bin/Debug/PlayMaker.dll b/bin/Debug/PlayMaker.dll
diff --git a/bin/Debug/UnityEngine.AIModule.dll b/bin/Debug/UnityEngine.AIModule.dll
diff --git a/bin/Debug/UnityEngine.ARModule.dll b/bin/Debug/UnityEngine.ARModule.dll
diff --git a/bin/Debug/UnityEngine.AccessibilityModule.dll b/bin/Debug/UnityEngine.AccessibilityModule.dll
diff --git a/bin/Debug/UnityEngine.AnimationModule.dll b/bin/Debug/UnityEngine.AnimationModule.dll
diff --git a/bin/Debug/UnityEngine.AssetBundleModule.dll b/bin/Debug/UnityEngine.AssetBundleModule.dll
diff --git a/bin/Debug/UnityEngine.AudioModule.dll b/bin/Debug/UnityEngine.AudioModule.dll
diff --git a/bin/Debug/UnityEngine.ClothModule.dll b/bin/Debug/UnityEngine.ClothModule.dll
diff --git a/bin/Debug/UnityEngine.ClusterInputModule.dll b/bin/Debug/UnityEngine.ClusterInputModule.dll
diff --git a/bin/Debug/UnityEngine.ClusterRendererModule.dll b/bin/Debug/UnityEngine.ClusterRendererModule.dll
diff --git a/bin/Debug/UnityEngine.CoreModule.dll b/bin/Debug/UnityEngine.CoreModule.dll
diff --git a/bin/Debug/UnityEngine.CrashReportingModule.dll b/bin/Debug/UnityEngine.CrashReportingModule.dll
diff --git a/bin/Debug/UnityEngine.DirectorModule.dll b/bin/Debug/UnityEngine.DirectorModule.dll
diff --git a/bin/Debug/UnityEngine.GameCenterModule.dll b/bin/Debug/UnityEngine.GameCenterModule.dll
diff --git a/bin/Debug/UnityEngine.GridModule.dll b/bin/Debug/UnityEngine.GridModule.dll
diff --git a/bin/Debug/UnityEngine.IMGUIModule.dll b/bin/Debug/UnityEngine.IMGUIModule.dll
diff --git a/bin/Debug/UnityEngine.ImageConversionModule.dll b/bin/Debug/UnityEngine.ImageConversionModule.dll
diff --git a/bin/Debug/UnityEngine.InputModule.dll b/bin/Debug/UnityEngine.InputModule.dll
diff --git a/bin/Debug/UnityEngine.JSONSerializeModule.dll b/bin/Debug/UnityEngine.JSONSerializeModule.dll
diff --git a/bin/Debug/UnityEngine.ParticleSystemModule.dll b/bin/Debug/UnityEngine.ParticleSystemModule.dll
diff --git a/bin/Debug/UnityEngine.ParticlesLegacyModule.dll b/bin/Debug/UnityEngine.ParticlesLegacyModule.dll
diff --git a/bin/Debug/UnityEngine.PerformanceReportingModule.dll b/bin/Debug/UnityEngine.PerformanceReportingModule.dll
diff --git a/bin/Debug/UnityEngine.Physics2DModule.dll b/bin/Debug/UnityEngine.Physics2DModule.dll
diff --git a/bin/Debug/UnityEngine.ScreenCaptureModule.dll b/bin/Debug/UnityEngine.ScreenCaptureModule.dll
diff --git a/bin/Debug/UnityEngine.SharedInternalsModule.dll b/bin/Debug/UnityEngine.SharedInternalsModule.dll
diff --git a/bin/Debug/UnityEngine.SpriteMaskModule.dll b/bin/Debug/UnityEngine.SpriteMaskModule.dll
diff --git a/bin/Debug/UnityEngine.SpriteShapeModule.dll b/bin/Debug/UnityEngine.SpriteShapeModule.dll
diff --git a/bin/Debug/UnityEngine.StyleSheetsModule.dll b/bin/Debug/UnityEngine.StyleSheetsModule.dll
diff --git a/bin/Debug/UnityEngine.TerrainModule.dll b/bin/Debug/UnityEngine.TerrainModule.dll
diff --git a/bin/Debug/UnityEngine.TerrainPhysicsModule.dll b/bin/Debug/UnityEngine.TerrainPhysicsModule.dll
diff --git a/bin/Debug/UnityEngine.TextRenderingModule.dll b/bin/Debug/UnityEngine.TextRenderingModule.dll
diff --git a/bin/Debug/UnityEngine.TilemapModule.dll b/bin/Debug/UnityEngine.TilemapModule.dll
diff --git a/bin/Debug/UnityEngine.UI.dll b/bin/Debug/UnityEngine.UI.dll
diff --git a/bin/Debug/UnityEngine.UIElementsModule.dll b/bin/Debug/UnityEngine.UIElementsModule.dll
diff --git a/bin/Debug/UnityEngine.UIModule.dll b/bin/Debug/UnityEngine.UIModule.dll
diff --git a/bin/Debug/UnityEngine.UNETModule.dll b/bin/Debug/UnityEngine.UNETModule.dll
diff --git a/bin/Debug/UnityEngine.UnityAnalyticsModule.dll b/bin/Debug/UnityEngine.UnityAnalyticsModule.dll
diff --git a/bin/Debug/UnityEngine.UnityConnectModule.dll b/bin/Debug/UnityEngine.UnityConnectModule.dll
diff --git a/bin/Debug/UnityEngine.UnityWebRequestAudioModule.dll b/bin/Debug/UnityEngine.UnityWebRequestAudioModule.dll
diff --git a/bin/Debug/UnityEngine.UnityWebRequestModule.dll b/bin/Debug/UnityEngine.UnityWebRequestModule.dll
diff --git a/bin/Debug/UnityEngine.UnityWebRequestTextureModule.dll b/bin/Debug/UnityEngine.UnityWebRequestTextureModule.dll
diff --git a/bin/Debug/UnityEngine.UnityWebRequestWWWModule.dll b/bin/Debug/UnityEngine.UnityWebRequestWWWModule.dll
diff --git a/bin/Debug/UnityEngine.VRModule.dll b/bin/Debug/UnityEngine.VRModule.dll
diff --git a/bin/Debug/UnityEngine.VehiclesModule.dll b/bin/Debug/UnityEngine.VehiclesModule.dll
diff --git a/bin/Debug/UnityEngine.VideoModule.dll b/bin/Debug/UnityEngine.VideoModule.dll
diff --git a/bin/Debug/UnityEngine.WebModule.dll b/bin/Debug/UnityEngine.WebModule.dll
diff --git a/bin/Debug/UnityEngine.WindModule.dll b/bin/Debug/UnityEngine.WindModule.dll
diff --git a/bin/Debug/UnityEngine.dll b/bin/Debug/UnityEngine.dll
diff --git a/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
diff --git a/obj/Debug/GrassyKnight.csproj.CopyComplete b/obj/Debug/GrassyKnight.csproj.CopyComplete
diff --git a/obj/Debug/GrassyKnight.csproj.CoreCompileInputs.cache b/obj/Debug/GrassyKnight.csproj.CoreCompileInputs.cache
@@ -0,0 +1 @@
+2b23b4b99b7ef2f9386ac538bd9f4fd0c076ba9e
diff --git a/obj/Debug/GrassyKnight.dll b/obj/Debug/GrassyKnight.dll