Merge branch 'dev'

# Conflicts: # TerrLauncherPackCreator/Properties/AssemblyInfo.cs
And42 · Mar 4, 2021 · 253b3b8 · 253b3b8
2 parents 85bc93f + 96ad2da
commit 253b3b8
Show file tree

Hide file tree

Showing 138 changed files with 2,071 additions and 2,194 deletions.
diff --git a/CommonLibrary/CommonLibrary.csproj b/CommonLibrary/CommonLibrary.csproj
@@ -1,67 +1,19 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{C963037D-1C4B-4387-BF22-5E15444DF3F5}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>CommonLibrary</RootNamespace>
-    <AssemblyName>CommonLibrary</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <Deterministic>true</Deterministic>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="JetBrains.Annotations, Version=2020.1.0.0, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
-      <HintPath>..\packages\JetBrains.Annotations.2020.1.0\lib\net20\JetBrains.Annotations.dll</HintPath>
-    </Reference>
-    <Reference Include="PresentationFramework" />
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="CommonConstants.cs" />
-    <Compile Include="CommonUtils\ApplicationDataUtils.cs" />
-    <Compile Include="CommonUtils\CollectionUtils.cs" />
-    <Compile Include="CommonUtils\CrashUtils.cs" />
-    <Compile Include="CommonUtils\IOUtils.cs" />
-    <Compile Include="CommonUtils\MessageBoxUtils.cs" />
-    <Compile Include="CommonUtils\UpdateUtils.cs" />
-    <Compile Include="CommonUtils\WindowUtils.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Resources\Localizations\StringResources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>StringResources.resx</DependentUpon>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Resources\Localizations\StringResources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>StringResources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-</Project>
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <TargetFramework>net5.0-windows</TargetFramework>
+        <UseWPF>true</UseWPF>
+        <AssemblyName>CommonLibrary</AssemblyName>
+        <RootNamespace>CommonLibrary</RootNamespace>
+        <Company />
+        <Nullable>enable</Nullable>
+    </PropertyGroup>
+
+    <ItemGroup>
+      <EmbeddedResource Update="Resources\Localizations\StringResources.resx">
+        <Generator>ResXFileCodeGenerator</Generator>
+        <LastGenOutput>StringResources.Designer.cs</LastGenOutput>
+      </EmbeddedResource>
+    </ItemGroup>
+
+</Project>
diff --git a/CommonLibrary/CommonUtils/ApplicationDataUtils.cs b/CommonLibrary/CommonUtils/ApplicationDataUtils.cs
@@ -1,6 +1,5 @@
 using System;
 using System.IO;
-using JetBrains.Annotations;
 
 namespace CommonLibrary.CommonUtils
 {
@@ -24,8 +23,7 @@ static ApplicationDataUtils()
             PathToSessionTempFolder = Path.Combine(PathToRootFolder, "SessionTemp");
         }
 
-        [NotNull]
-        public static string GenerateNonExistentFilePath([CanBeNull] string extension = null)
+        public static string GenerateNonExistentFilePath(string? extension = null)
         {
             string filePath;
             do
@@ -36,7 +34,6 @@ public static string GenerateNonExistentFilePath([CanBeNull] string extension =
             return filePath;
         }
 
-        [NotNull]
         public static string GenerateNonExistentDirPath()
         {
             string dirPath;

diff --git a/CommonLibrary/CommonUtils/ColorUtils.cs b/CommonLibrary/CommonUtils/ColorUtils.cs
@@ -0,0 +1,15 @@
+namespace CommonLibrary.CommonUtils
+{
+    public static class ColorUtils
+    {
+        public static System.Windows.Media.Color ToMediaColor(this in System.Drawing.Color color)
+        {
+            return System.Windows.Media.Color.FromArgb(color.A, color.R, color.G, color.B);
+        }
+
+        public static System.Drawing.Color ToDrawingColor(this in System.Windows.Media.Color color)
+        {
+            return System.Drawing.Color.FromArgb(color.A, color.R, color.G, color.B);
+        }
+    }
+}
diff --git a/CommonLibrary/Properties/AssemblyInfo.cs b/CommonLibrary/Properties/AssemblyInfo.cs
diff --git a/CommonLibrary/packages.config b/CommonLibrary/packages.config
diff --git a/CrossPlatform/Code/Enums/BonusType.cs b/CrossPlatform/Code/Enums/BonusType.cs
@@ -0,0 +1,8 @@
+namespace CrossPlatform.Code.Enums
+{
+    public enum BonusType
+    {
+        OldVersionOwners = 0,
+        LastEnumElement
+    }
+}
diff --git a/CrossPlatform/Code/Enums/FileType.cs b/CrossPlatform/Code/Enums/FileType.cs
@@ -0,0 +1,14 @@
+namespace CrossPlatform.Code.Enums
+{
+    public enum FileType
+    {
+        Texture = 0,
+        Map = 1,
+        Character = 2,
+        Gui = 3,
+        Translation = 4,
+        Font = 5,
+        Audio = 6,
+        LastEnumElement
+    }
+}
diff --git a/CrossPlatform/Code/Enums/PredefinedPackTag.cs b/CrossPlatform/Code/Enums/PredefinedPackTag.cs
@@ -0,0 +1,36 @@
+namespace CrossPlatform.Code.Enums
+{
+    public enum PredefinedPackTag
+    {
+        TexturesAnimated = 0,
+        TexturesWeapons = 1,
+        TexturesTools = 2,
+        TexturesVanity = 3,
+        TexturesArmor = 4,
+        TexturesPets = 5,
+        TexturesBosses = 6,
+        TexturesMobs = 7,
+        TexturesNpc = 8,
+        TexturesBlocks = 9,
+        TexturesOther = 10,
+        MapsBuildings = 11,
+        MapsAdventure = 12,
+        MapsSurvival = 13,
+        MapsOther = 14,
+        CharactersCombat = 15,
+        CharactersAppearance = 16,
+        CharactersOther = 17,
+        GuiAnimated = 18,
+        GuiInventory = 19,
+        GuiHealthOrMana = 20,
+        GuiGeneral = 21,
+        GuiOther = 22,
+        AudioBiomsOrLocation = 23,
+        AudioBosses = 24,
+        AudioEvents = 25,
+        AudioSounds = 26,
+        AudioOther = 27,
+        FontsAnimated = 28,
+        LastEnumElement
+    }
+}
diff --git a/CrossPlatform/Code/FileInfos/AudioFileInfo.cs b/CrossPlatform/Code/FileInfos/AudioFileInfo.cs
@@ -0,0 +1,9 @@
+using CrossPlatform.Code.Interfaces;
+
+namespace CrossPlatform.Code.FileInfos
+{
+
+    public record AudioFileInfo(
+        string EntryName
+    ) : IPackFileInfo;
+}
diff --git a/CrossPlatform/Code/FileInfos/CharacterFileInfo.cs b/CrossPlatform/Code/FileInfos/CharacterFileInfo.cs
@@ -0,0 +1,8 @@
+using CrossPlatform.Code.Interfaces;
+
+namespace CrossPlatform.Code.FileInfos
+{
+    public record CharacterFileInfo(
+        string ResultFileName
+    ) : IPackFileInfo;
+}
diff --git a/CrossPlatform/Code/FileInfos/FontFileInfo.cs b/CrossPlatform/Code/FileInfos/FontFileInfo.cs
@@ -0,0 +1,8 @@
+using CrossPlatform.Code.Interfaces;
+
+namespace CrossPlatform.Code.FileInfos {
+
+    public record FontFileInfo(
+        string EntryName
+    ) : IPackFileInfo;
+}
diff --git a/CrossPlatform/Code/FileInfos/GuiFileInfo.cs b/CrossPlatform/Code/FileInfos/GuiFileInfo.cs
@@ -0,0 +1,30 @@
+using System.Diagnostics.CodeAnalysis;
+
+namespace CrossPlatform.Code.FileInfos {
+
+    public record GuiFileInfo : TextureFileInfo
+    {
+        [SuppressMessage("ReSharper", "InconsistentNaming")]
+        public GuiFileInfo(
+            TextureType Type,
+            string EntryName,
+            int ElementId,
+            bool Animated,
+            bool AnimateInGui,
+            int NumberOfVerticalFrames,
+            int NumberOfHorizontalFrames,
+            int MillisecondsPerFrame,
+            bool ApplyOriginalSize
+        ) : base(
+            Type,
+            EntryName,
+            ElementId,
+            Animated,
+            AnimateInGui,
+            NumberOfVerticalFrames,
+            NumberOfHorizontalFrames,
+            MillisecondsPerFrame,
+            ApplyOriginalSize
+        ) { }
+    }
+}
diff --git a/CrossPlatform/Code/FileInfos/MapFileInfo.cs b/CrossPlatform/Code/FileInfos/MapFileInfo.cs
@@ -0,0 +1,8 @@
+using CrossPlatform.Code.Interfaces;
+
+namespace CrossPlatform.Code.FileInfos
+{
+    public record MapFileInfo(
+        string ResultFileName
+    ) : IPackFileInfo;
+}
diff --git a/CrossPlatform/Code/FileInfos/TextureFileInfo.cs b/CrossPlatform/Code/FileInfos/TextureFileInfo.cs
@@ -0,0 +1,27 @@
+using CrossPlatform.Code.Interfaces;
+
+namespace CrossPlatform.Code.FileInfos
+{
+    public record TextureFileInfo(
+        TextureFileInfo.TextureType Type,
+        string EntryName,
+        int ElementId,
+        bool Animated,
+        bool AnimateInGui,
+        int NumberOfVerticalFrames,
+        int NumberOfHorizontalFrames,
+        int MillisecondsPerFrame,
+        bool ApplyOriginalSize
+    ) : IPackFileInfo
+    {
+        public enum TextureType
+        {
+            General = 0,
+            ItemDeprecated = 1,
+            NpcDeprecated = 2,
+            BuffDeprecated = 3,
+            ExtraDeprecated = 4,
+            Item = 5
+        }
+    }
+}
diff --git a/CrossPlatform/Code/FileInfos/TranslationFileInfo.cs b/CrossPlatform/Code/FileInfos/TranslationFileInfo.cs
@@ -0,0 +1,8 @@
+using CrossPlatform.Code.Interfaces;
+
+namespace CrossPlatform.Code.FileInfos
+{
+    public record TranslationFileInfo(
+        string Language
+    ) : IPackFileInfo;
+}