Made the base package's description more descriptive

This reverts commit 2973bd98e2.
This reverts commit 04c6bb5ff8.

CHANGELOG.md

@@ -26,13 +26,8 @@ Improvements
 - Added GenericInput support for Buttons.None
 
 Removals
-- **Moved Input namespace into MLEM.Input**
 - Marked AStar.InfiniteCost as obsolete
 
-### MLEM.Input
-Additions
-- Added Input namespace that was originally a part of MLEM
-
 ### MLEM.Ui
 Additions
 - Added Element.AutoNavGroup which allows forming groups for auto-navigation

Demos.Android/Demos.Android.csproj

@@ -87,10 +87,6 @@
             <Project>{1bc4682b-aa14-4937-b5c7-707e20fe88ff}</Project>
             <Name>Demos</Name>
         </ProjectReference>
-        <ProjectReference Include="..\MLEM.Input\MLEM.Input.csproj">
-          <Project>{34c0707b-1b0a-437e-9536-39ec7012c1b5}</Project>
-          <Name>MLEM.Input</Name>
-        </ProjectReference>
         <ProjectReference Include="..\MLEM.Startup\MLEM.Startup.csproj">
             <Project>{997f4739-7bec-4621-b9ca-68deb2d74412}</Project>
             <Name>MLEM.Startup</Name>

Docs/index.md

@@ -11,9 +11,8 @@
 - See [the changelog](https://mlem.ellpeck.de/CHANGELOG.html) for information on updates
 
 # Packages
-- **MLEM** is the base package, which provides extension methods and additional features for MonoGame and FNA
+- **MLEM** is the base package, which provides extension methods and additional features for MonoGame and FNA, including a text formatting system and simple input handling
-- **MLEM.Input** features simple input handling, including a unified way to query mouse, keyboard, gamepad and touch input, a simple keybind system, and a text input field abstraction
+- **MLEM.Ui** features a mouse, keyboard, gamepad and touch ready Ui system that features automatic anchoring, sizing and several ready-to-use element types
-- **MLEM.Ui** includes a mouse, keyboard, gamepad and touch ready Ui system that features automatic anchoring, sizing and several ready-to-use element types
 - **MLEM.Extended** ties in with MonoGame.Extended and other MonoGame and FNA libraries
 - **MLEM.Data** provides simple loading and processing of textures and other data, including the ability to load non-XNB content files easily
 - **MLEM.Startup** combines MLEM with some other useful libraries into a quick Game startup class

MLEM.FNA.sln

@@ -20,8 +20,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FNA.Core", "FNA\FNA.Core.cs
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FontStashSharp.FNA.Core", "FontStashSharp\src\XNA\FontStashSharp.FNA.Core.csproj", "{0B410591-3AED-4C82-A07A-516FF493709B}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MLEM.Input.FNA", "MLEM.Input\MLEM.Input.FNA.csproj", "{AB5EEA09-6373-4742-B809-2A348CDDB869}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -68,9 +66,5 @@ Global
 		{0B410591-3AED-4C82-A07A-516FF493709B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{0B410591-3AED-4C82-A07A-516FF493709B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0B410591-3AED-4C82-A07A-516FF493709B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AB5EEA09-6373-4742-B809-2A348CDDB869}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AB5EEA09-6373-4742-B809-2A348CDDB869}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AB5EEA09-6373-4742-B809-2A348CDDB869}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AB5EEA09-6373-4742-B809-2A348CDDB869}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 EndGlobal

MLEM.Input/MLEM.Input.FNA.csproj

@@ -1,34 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-    <PropertyGroup>
-        <TargetFramework>netstandard2.0</TargetFramework>
-        <GenerateDocumentationFile>true</GenerateDocumentationFile>
-        <ProduceReferenceAssembly>true</ProduceReferenceAssembly>
-        <RootNamespace>MLEM.Input</RootNamespace>
-        <DefineConstants>$(DefineConstants);FNA</DefineConstants>
-    </PropertyGroup>
-
-    <PropertyGroup>
-        <Authors>Ellpeck</Authors>
-        <Description>Simple input handling for FNA, including a unified way to query mouse, keyboard, gamepad and touch input, a simple keybind system, and a text input field abstraction.</Description>
-        <PackageReleaseNotes>See the full changelog at https://mlem.ellpeck.de/CHANGELOG</PackageReleaseNotes>
-        <PackageTags>fna input handler keybind mouse keyboard gamepad touch ellpeck mlem utility extensions</PackageTags>
-        <PackageProjectUrl>https://mlem.ellpeck.de/</PackageProjectUrl>
-        <RepositoryUrl>https://github.com/Ellpeck/MLEM</RepositoryUrl>
-        <PackageLicenseExpression>MIT</PackageLicenseExpression>
-        <PackageIcon>Logo.png</PackageIcon>
-        <PackageReadmeFile>README.md</PackageReadmeFile>
-    </PropertyGroup>
-
-    <ItemGroup>
-        <ProjectReference Include="..\MLEM\MLEM.FNA.csproj" />
-
-        <ProjectReference Include="..\FNA\FNA.Core.csproj">
-            <PrivateAssets>all</PrivateAssets>
-        </ProjectReference>
-    </ItemGroup>
-
-    <ItemGroup>
-        <None Include="../Media/Logo.png" Pack="true" PackagePath="" />
-        <None Include="../Docs/index.md" Pack="true" PackagePath="README.md" />
-    </ItemGroup>
-</Project>

MLEM.Input/MLEM.Input.csproj

@@ -1,32 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-    <PropertyGroup>
-        <TargetFramework>netstandard2.0</TargetFramework>
-        <GenerateDocumentationFile>true</GenerateDocumentationFile>
-        <ProduceReferenceAssembly>true</ProduceReferenceAssembly>
-    </PropertyGroup>
-
-    <PropertyGroup>
-        <Authors>Ellpeck</Authors>
-        <Description>Simple input handling for MonoGame, including a unified way to query mouse, keyboard, gamepad and touch input, a simple keybind system, and a text input field abstraction.</Description>
-        <PackageReleaseNotes>See the full changelog at https://mlem.ellpeck.de/CHANGELOG</PackageReleaseNotes>
-        <PackageTags>monogame input handler keybind mouse keyboard gamepad touch ellpeck mlem utility extensions</PackageTags>
-        <PackageProjectUrl>https://mlem.ellpeck.de/</PackageProjectUrl>
-        <RepositoryUrl>https://github.com/Ellpeck/MLEM</RepositoryUrl>
-        <PackageLicenseExpression>MIT</PackageLicenseExpression>
-        <PackageIcon>Logo.png</PackageIcon>
-        <PackageReadmeFile>README.md</PackageReadmeFile>
-    </PropertyGroup>
-
-    <ItemGroup>
-        <ProjectReference Include="..\MLEM\MLEM.csproj" />
-
-        <PackageReference Include="MonoGame.Framework.DesktopGL" Version="3.8.0.1641">
-            <PrivateAssets>all</PrivateAssets>
-        </PackageReference>
-    </ItemGroup>
-
-    <ItemGroup>
-        <None Include="../Media/Logo.png" Pack="true" PackagePath="" />
-        <None Include="../Docs/index.md" Pack="true" PackagePath="README.md" />
-    </ItemGroup>
-</Project>

MLEM.Startup/MLEM.Startup.FNA.csproj

@@ -23,6 +23,7 @@
     <ItemGroup>
         <PackageReference Include="Coroutine" Version="2.1.3" />
         <ProjectReference Include="..\MLEM.Ui\MLEM.Ui.FNA.csproj" />
+        <ProjectReference Include="..\MLEM\MLEM.FNA.csproj" />
 
         <ProjectReference Include="..\FNA\FNA.Core.csproj">
             <PrivateAssets>all</PrivateAssets>

MLEM.Startup/MLEM.Startup.csproj

@@ -21,6 +21,7 @@
     <ItemGroup>
         <PackageReference Include="Coroutine" Version="2.1.3" />
         <ProjectReference Include="..\MLEM.Ui\MLEM.Ui.csproj" />
+        <ProjectReference Include="..\MLEM\MLEM.csproj" />
         
         <PackageReference Include="MonoGame.Framework.DesktopGL" Version="3.8.0.1641">
             <PrivateAssets>all</PrivateAssets>

MLEM.Ui/MLEM.Ui.FNA.csproj

@@ -21,7 +21,7 @@
 
     <ItemGroup>
         <PackageReference Include="TextCopy" Version="6.1.0" />
-        <ProjectReference Include="..\MLEM.Input\MLEM.Input.FNA.csproj" />
+        <ProjectReference Include="..\MLEM\MLEM.FNA.csproj" />
 
         <ProjectReference Include="..\FNA\FNA.Core.csproj">
             <PrivateAssets>all</PrivateAssets>

MLEM.Ui/MLEM.Ui.csproj

@@ -19,7 +19,7 @@
     
     <ItemGroup>
         <PackageReference Include="TextCopy" Version="6.1.0" />
-        <ProjectReference Include="..\MLEM.Input\MLEM.Input.csproj" />
+        <ProjectReference Include="..\MLEM\MLEM.csproj" />
         
         <PackageReference Include="MonoGame.Framework.DesktopGL" Version="3.8.0.1641">
             <PrivateAssets>all</PrivateAssets>

MLEM.sln

@@ -22,8 +22,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Demos.Android", "Demos.Andr
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tests", "Tests\Tests.csproj", "{53D52C3F-67FB-4F32-A794-EAB140BBFC11}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MLEM.Input", "MLEM.Input\MLEM.Input.csproj", "{34C0707B-1B0A-437E-9536-39EC7012C1B5}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -74,9 +72,5 @@ Global
 		{53D52C3F-67FB-4F32-A794-EAB140BBFC11}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{53D52C3F-67FB-4F32-A794-EAB140BBFC11}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{53D52C3F-67FB-4F32-A794-EAB140BBFC11}.Release|Any CPU.Build.0 = Release|Any CPU
-		{34C0707B-1B0A-437E-9536-39EC7012C1B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{34C0707B-1B0A-437E-9536-39EC7012C1B5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{34C0707B-1B0A-437E-9536-39EC7012C1B5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{34C0707B-1B0A-437E-9536-39EC7012C1B5}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 EndGlobal

MLEM/MLEM.FNA.csproj

@@ -9,7 +9,7 @@
 
     <PropertyGroup>
         <Authors>Ellpeck</Authors>
-        <Description>MLEM Library for Extending FNA provides extension methods and additional features for FNA</Description>
+        <Description>The MLEM base package, which provides extension methods and additional features for FNA, including a text formatting system and simple input handling</Description>
         <PackageReleaseNotes>See the full changelog at https://mlem.ellpeck.de/CHANGELOG</PackageReleaseNotes>
         <PackageTags>fna ellpeck mlem utility extensions</PackageTags>
         <PackageProjectUrl>https://mlem.ellpeck.de/</PackageProjectUrl>

MLEM/MLEM.csproj

@@ -7,7 +7,7 @@
 
     <PropertyGroup>
         <Authors>Ellpeck</Authors>
-        <Description>MLEM Library for Extending MonoGame provides extension methods and additional features for MonoGame</Description>
+        <Description>The MLEM base package, which provides extension methods and additional features for MonoGame, including a text formatting system and simple input handling</Description>
         <PackageReleaseNotes>See the full changelog at https://mlem.ellpeck.de/CHANGELOG</PackageReleaseNotes>
         <PackageTags>monogame ellpeck mlem utility extensions</PackageTags>
         <PackageProjectUrl>https://mlem.ellpeck.de/</PackageProjectUrl>

README.md

@@ -11,9 +11,8 @@
 - See [the changelog](https://github.com/Ellpeck/MLEM/blob/main/CHANGELOG.md) for information on updates
 
 # Packages
-- **MLEM** is the base package, which provides extension methods and additional features for MonoGame and FNA
+- **MLEM** is the base package, which provides extension methods and additional features for MonoGame and FNA, including a text formatting system and simple input handling
-- **MLEM.Input** features simple input handling, including a unified way to query mouse, keyboard, gamepad and touch input, a simple keybind system, and a text input field abstraction
+- **MLEM.Ui** features a mouse, keyboard, gamepad and touch ready Ui system that features automatic anchoring, sizing and several ready-to-use element types
-- **MLEM.Ui** includes a mouse, keyboard, gamepad and touch ready Ui system that features automatic anchoring, sizing and several ready-to-use element types
 - **MLEM.Extended** ties in with MonoGame.Extended and other MonoGame and FNA libraries
 - **MLEM.Data** provides simple loading and processing of textures and other data, including the ability to load non-XNB content files easily
 - **MLEM.Startup** combines MLEM with some other useful libraries into a quick Game startup class