switch to using better keybinding widget

Author: FluffierThanThou

About/About.xml

@@ -21,10 +21,10 @@ Proxyer:    Japanese Translation
 Oleksii Bespalov:    Fix bug in settings persistance
 Jorge Martínez:    Spanish translations
 xProtosx:    Russian translation
-Kroeze:    
+Kroeze:    ‘Release 3.5.76 [nolog]’, ‘Release v0.18.2.3 [nolog]’, ‘Release v0.18.2.2 [nolog]’, [A13]  - initial release, version url, Initial release
 
 <size=24>Version</size>
-This is version 4.4.81, for RimWorld 1.1.2579.
+This is version 4.4.82, for RimWorld 1.1.2610.
 
 </description>
   <supportedVersions>

Assemblies/BetterKeybinding.dll

@@ -4,16 +4,26 @@ Any original content (e.g. text, imagery or sounds) are licensed under
 CC-BY-SA 4.0, the text of which is given below.
 =======================================================================
 
-Copyright 2017 Fluffy
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+Copyright 2020 Fluffy
 
+Permission is hereby granted, free of charge, to any person obtaining 
+a copy of this software and associated documentation files (the 
+"Software"), to deal in the Software without restriction, including 
+without limitation the rights to use, copy, modify, merge, publish, 
+distribute, sublicense, and/or sell copies of the Software, and to 
+permit persons to whom the Software is furnished to do so, subject to 
+the following conditions:
 
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
 
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABI-
+LITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
+SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES
+OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR 
+OTHER DEALINGS IN THE SOFTWARE.
 
 
 
@@ -23,62 +33,6 @@ software and documentation are licensed under the MIT license, the text
 of which is given above.
 =======================================================================
 
-Attribution-ShareAlike 4.0 International
-
-=======================================================================
-
-Creative Commons Corporation ("Creative Commons") is not a law firm and
-does not provide legal services or legal advice. Distribution of
-Creative Commons public licenses does not create a lawyer-client or
-other relationship. Creative Commons makes its licenses and related
-information available on an "as-is" basis. Creative Commons gives no
-warranties regarding its licenses, any material licensed under their
-terms and conditions, or any related information. Creative Commons
-disclaims all liability for damages resulting from their use to the
-fullest extent possible.
-
-Using Creative Commons Public Licenses
-
-Creative Commons public licenses provide a standard set of terms and
-conditions that creators and other rights holders may use to share
-original works of authorship and other material subject to copyright
-and certain other rights specified in the public license below. The
-following considerations are for informational purposes only, are not
-exhaustive, and do not form part of our licenses.
-
-     Considerations for licensors: Our public licenses are
-     intended for use by those authorized to give the public
-     permission to use material in ways otherwise restricted by
-     copyright and certain other rights. Our licenses are
-     irrevocable. Licensors should read and understand the terms
-     and conditions of the license they choose before applying it.
-     Licensors should also secure all rights necessary before
-     applying our licenses so that the public can reuse the
-     material as expected. Licensors should clearly mark any
-     material not subject to the license. This includes other CC-
-     licensed material, or material used under an exception or
-     limitation to copyright. More considerations for licensors:
-	wiki.creativecommons.org/Considerations_for_licensors
-
-     Considerations for the public: By using one of our public
-     licenses, a licensor grants the public permission to use the
-     licensed material under specified terms and conditions. If
-     the licensor's permission is not necessary for any reason--for
-     example, because of any applicable exception or limitation to
-     copyright--then that use is not regulated by the license. Our
-     licenses grant only permissions under copyright and certain
-     other rights that a licensor has authority to grant. Use of
-     the licensed material may still be restricted for other
-     reasons, including because others have copyright or other
-     rights in the material. A licensor may make special requests,
-     such as asking that all changes be marked or described.
-     Although not required by our licenses, you are encouraged to
-     respect those requests where reasonable. More_considerations
-     for the public: 
-	wiki.creativecommons.org/Considerations_for_licensees
-
-=======================================================================
-
 Creative Commons Attribution-ShareAlike 4.0 International Public
 License
 
@@ -450,5 +404,3 @@ the avoidance of doubt, this paragraph does not form part of the
 public licenses.
 
 Creative Commons may be contacted at creativecommons.org.
-
-0Trackers

Assemblies/FollowMe!.dll

@@ -17,7 +17,7 @@ Can safely be enabled/disabled in ongoing saves.
  - Oleksii Bespalov:	Fix bug in settings persistance
  - Jorge Martínez:	Spanish translations
  - xProtosx:	Russian translation
- - Kroeze:	
+ - Kroeze:	'Release 3.5.76 [nolog]', 'Release v0.18.2.3 [nolog]', 'Release v0.18.2.2 [nolog]', [A13]  - initial release, version url, Initial release
 
 # Think you found a bug? 
 Please read [this guide](http://steamcommunity.com/sharedfiles/filedetails/?id=725234314) before creating a bug report,
@@ -40,4 +40,4 @@ Show your appreciation by buying me a coffee (or contribute towards a nice singl
 [![I Have a Black Dog](https://i.ibb.co/ss59Rwy/New-Project-2.png)](https://www.youtube.com/watch?v=XiCrniLQGYc)
 
 # Version
-This is version 4.4.81, for RimWorld 1.1.2579.
+This is version 4.4.82, for RimWorld 1.1.2610.

Defs/KeyBindingDefs/keybinding.xml

@@ -11,7 +11,6 @@ namespace FollowMe
     public class CinematicCameraManager : GameComponent
     {
         public static CinematicCamera currentCamera;
-        public static KeyBindingDef toggleCamera;
         private static bool _patched;
 
         public static List<CinematicCamera> Cameras => DefDatabase<CinematicCamera>.AllDefsListForReading;
@@ -36,7 +35,6 @@ public override void LoadedGame()
 
         public CinematicCameraManager( Game game )
         {
-            toggleCamera = KeyBindingDef.Named( "CinematicCamera" );
         }
 
         public static void Stop( string reason = null, bool stopFollow = true )
@@ -82,7 +80,7 @@ public override void GameComponentOnGUI()
         {
             base.GameComponentOnGUI();
 
-            if ( toggleCamera.KeyDownEvent )
+            if ( Settings.CinematicCameraKey.JustPressed )
                 CycleCameras();
         }
     }

LICENSE

@@ -37,8 +37,6 @@ public class FollowMe : GameComponent
             KeyBindingDefOf.MapDolly_Left
         };
 
-        private readonly KeyBindingDef _followKey = KeyBindingDef.Named( "FollowSelected" );
-
         public FollowMe()
         {
             // scribe
@@ -139,6 +137,11 @@ public override void GameComponentOnGUI()
             if ( Current.ProgramState != ProgramState.Playing )
                 return; // gamecomp is already active in the 'setup' stage, but follow me shouldnt be.
 
+
+            // start/stop following thing on key press
+            if ( Settings.FollowMeKey.JustPressed )
+                TryStartFollow( Find.Selector.SingleSelectedObject as Thing );
+
             if ( Event.current.type   == EventType.MouseUp &&
                  Event.current.button == 2 )
             {
@@ -159,9 +162,6 @@ public override void GameComponentOnGUI()
 
         public override void GameComponentUpdate()
         {
-            // start/stop following thing on key press
-            if ( _followKey.KeyDownEvent )
-                TryStartFollow( Find.Selector.SingleSelectedObject as Thing );
 
             if ( !_enabled )
                 return;

Readme.md

@@ -22,6 +22,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
+    <LangVersion>8</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>none</DebugType>
@@ -31,6 +32,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
+    <LangVersion>8</LangVersion>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="0Harmony, Version=2.0.0.7, Culture=neutral, processorArchitecture=MSIL">
@@ -70,10 +72,17 @@
     <Compile Include="Mod.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Resources.cs" />
+    <Compile Include="Settings.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\TOOLS\BetterKeybinding\BetterKeybinding.csproj">
+      <Project>{7A074D05-578C-48C4-9A0E-1C289CF862E1}</Project>
+      <Name>BetterKeybinding</Name>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PostBuildEvent>mod update -x -n "Follow Me"</PostBuildEvent>

Source/Cinematics/CinematicCameraManager.cs

@@ -1,9 +1,11 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.24720.0
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.30002.166
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FollowMe!", "FollowMe.csproj", "{FAE5180C-6ADE-4E9F-BC22-BDC0407AFCC9}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FollowMe", "FollowMe.csproj", "{FAE5180C-6ADE-4E9F-BC22-BDC0407AFCC9}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BetterKeybinding", "..\..\..\TOOLS\BetterKeybinding\BetterKeybinding.csproj", "{7A074D05-578C-48C4-9A0E-1C289CF862E1}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -15,8 +17,15 @@ Global
 		{FAE5180C-6ADE-4E9F-BC22-BDC0407AFCC9}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{FAE5180C-6ADE-4E9F-BC22-BDC0407AFCC9}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FAE5180C-6ADE-4E9F-BC22-BDC0407AFCC9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7A074D05-578C-48C4-9A0E-1C289CF862E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7A074D05-578C-48C4-9A0E-1C289CF862E1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7A074D05-578C-48C4-9A0E-1C289CF862E1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7A074D05-578C-48C4-9A0E-1C289CF862E1}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {4FDDBE97-02B6-43A9-9A72-EBA2742550B9}
+	EndGlobalSection
 EndGlobal

Source/FollowMe.cs

@@ -11,9 +11,10 @@ namespace FollowMe
 {
     public class Mod : Verse.Mod
     {
+        public static Settings Settings { get; private set; }
         public Mod( ModContentPack content ) : base( content )
         {
-            GetSettings<Settings>();
+            Settings = GetSettings<Settings>();
         }
 
         public override string SettingsCategory()
@@ -42,32 +43,4 @@ public static void DoMessage( string message, MessageTypeDef type, GlobalTargetI
                 type.sound.PlayOneShotOnCamera();
         }
     }
-
-    public class Settings : ModSettings
-    {
-        public static bool showNotifications = true;
-        public static bool playSounds        = true;
-        public static bool edgeDetection     = true;
-
-        public override void ExposeData()
-        {
-            base.ExposeData();
-            Scribe_Values.Look( ref showNotifications, "showNotifications", true );
-            Scribe_Values.Look( ref playSounds, "playSounds", true );
-            Scribe_Values.Look( ref edgeDetection, "edgeDetection", true );
-        }
-
-        public static void DoWindowContents( Rect rect )
-        {
-            var list = new Listing_Standard();
-            list.Begin( rect );
-            list.CheckboxLabeled( "FollowMe.Notifications".Translate(), ref showNotifications,
-                                  "FollowMe.Notifications.Tooltip".Translate() );
-            list.CheckboxLabeled( "FollowMe.Sounds".Translate(), ref playSounds,
-                                  "FollowMe.Sounds.Tooltip".Translate() );
-            list.CheckboxLabeled( "FollowMe.EdgeDetection".Translate(), ref edgeDetection,
-                                  "FollowMe.EdgeDetection.Tooltip".Translate() );
-            list.End();
-        }
-    }
 }

Source/FollowMe.csproj

@@ -35,4 +35,4 @@
 //      Revision
 //
 [assembly: AssemblyVersion("4.0.0")]
-[assembly: AssemblyFileVersion("4.4.81")]
+[assembly: AssemblyFileVersion("4.4.82")]

Source/FollowMe.sln

@@ -0,0 +1,61 @@
+// Settings.cs
+// Copyright Karel Kroeze, -2020
+
+using BetterKeybinding;
+using UnityEngine;
+using Verse;
+
+namespace FollowMe
+{
+    public class Settings : ModSettings
+    {
+        public static  bool    showNotifications = true;
+        public static  bool    playSounds        = true;
+        public static  bool    edgeDetection     = true;
+        private static KeyBind _followMeKey;
+
+        public static KeyBind FollowMeKey
+        {
+            get
+            {
+                _followMeKey??=new KeyBind( "Fluffy.FollowMe.KeyBind".Translate(), KeyCode.Home );
+                return _followMeKey;
+            }
+        }
+
+        private static KeyBind _cinematicCameraKey;
+
+        public static KeyBind CinematicCameraKey
+        {
+            get
+            {
+                _cinematicCameraKey??= new KeyBind( "Fluffy.CinematicCamera.KeyBind".Translate(), KeyCode.End );
+                return _cinematicCameraKey;
+            }
+        }
+
+        public override void ExposeData()
+        {
+            base.ExposeData();
+            Scribe_Values.Look( ref showNotifications, "showNotifications", true );
+            Scribe_Values.Look( ref playSounds, "playSounds", true );
+            Scribe_Values.Look( ref edgeDetection, "edgeDetection", true );
+            Scribe_Deep.Look( ref _followMeKey, "followMeKey" );
+            Scribe_Deep.Look( ref _cinematicCameraKey, "cinematicCameraKey" );
+        }
+
+        public static void DoWindowContents( Rect rect )
+        {
+            var list = new Listing_Standard();
+            list.Begin( rect );
+            list.CheckboxLabeled( "FollowMe.Notifications".Translate(), ref showNotifications,
+                                  "FollowMe.Notifications.Tooltip".Translate() );
+            list.CheckboxLabeled( "FollowMe.Sounds".Translate(), ref playSounds,
+                                  "FollowMe.Sounds.Tooltip".Translate() );
+            list.CheckboxLabeled( "FollowMe.EdgeDetection".Translate(), ref edgeDetection,
+                                  "FollowMe.EdgeDetection.Tooltip".Translate() );
+            FollowMeKey.Draw( list.GetRect( 30 ) );
+            list.End();
+        }
+    }
+}