Remove --clonecompat flag in favor of loading first culture in the li…

…st as a default when loading GFX
ethanmoffat · Sep 9, 2022 · 84f6b94 · 84f6b94
1 parent aa0f957
commit 84f6b94
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 27 deletions.
diff --git a/EOLib.Config/ConfigFileLoadActions.cs b/EOLib.Config/ConfigFileLoadActions.cs
@@ -61,7 +61,6 @@ public void LoadConfigFile()
             _configRepository.Interaction = !configFile.GetValue(ConfigStrings.Chat, ConfigStrings.Interaction, out tempBool) || tempBool;
             _configRepository.LogChatToFile = configFile.GetValue(ConfigStrings.Chat, ConfigStrings.LogChat, out tempBool) && tempBool;
 
-            _configRepository.MainCloneCompat = configFile.GetValue(ConfigStrings.Custom, ConfigStrings.MainCloneCompat, out tempBool) && tempBool;
             _configRepository.AccountCreateTimeout = TimeSpan.FromMilliseconds(
                 configFile.GetValue(ConfigStrings.Custom, ConfigStrings.AccountCreateTimeout, out tempInt)
                     ? tempInt

diff --git a/EOLib.Config/IConfigurationRepository.cs b/EOLib.Config/IConfigurationRepository.cs
@@ -30,8 +30,6 @@ public interface IConfigurationRepository
         bool Interaction { get; set; }
         bool LogChatToFile { get; set; }
 
-        bool MainCloneCompat { get; set; }
-
         TimeSpan AccountCreateTimeout { get; set; }
 
         bool EnableLog { get; set; }
@@ -64,8 +62,6 @@ public interface IConfigurationProvider
         bool Interaction { get; }
         bool LogChatToFile { get; }
 
-        bool MainCloneCompat { get; }
-
         TimeSpan AccountCreateTimeout { get; }
 
         bool EnableLog { get; }
@@ -99,8 +95,6 @@ public class ConfigurationRepository : IConfigurationRepository, IConfigurationP
         public bool Interaction { get; set; }
         public bool LogChatToFile { get; set; }
 
-        public bool MainCloneCompat { get; set; }
-
         public TimeSpan AccountCreateTimeout { get; set; }
 
         public bool EnableLog { get; set; }

diff --git a/EOLib.Graphics.Test/NativeGraphicsLoaderTest.cs b/EOLib.Graphics.Test/NativeGraphicsLoaderTest.cs
@@ -1,12 +1,11 @@
-using System.Diagnostics.CodeAnalysis;
-using System.IO;
+using Moq;
 using NUnit.Framework;
-using Moq;
 using PELoaderLib;
 using SixLabors.ImageSharp;
-using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Formats.Bmp;
-using EOLib.Config;
+using SixLabors.ImageSharp.PixelFormats;
+using System.Diagnostics.CodeAnalysis;
+using System.IO;
 
 namespace EOLib.Graphics.Test
 {
@@ -22,7 +21,7 @@ public class NativeGraphicsLoaderTest
         public void SetUp()
         {
             _modules = Mock.Of<IPEFileCollection>();
-            _nativeGraphicsLoader = new NativeGraphicsLoader(_modules, Mock.Of<IConfigurationProvider>(x => x.MainCloneCompat == false));
+            _nativeGraphicsLoader = new NativeGraphicsLoader(_modules);
         }
 
         [Test]

diff --git a/EOLib.Graphics/EOLib.Graphics.csproj b/EOLib.Graphics/EOLib.Graphics.csproj
@@ -14,7 +14,7 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="AutomaticTypeMapper" Version="1.4.1" />
-    <PackageReference Include="PELoaderLib" Version="1.3.0" />
+    <PackageReference Include="PELoaderLib" Version="1.4.0" />
     <PackageReference Include="MonoGame.Framework.DesktopGL" Version="3.8.0.1641" />
     <PackageReference Include="SixLabors.ImageSharp" Version="2.0.0" />
     <PackageReference Include="SixLabors.ImageSharp.Drawing" Version="1.0.0-beta14" />

diff --git a/EOLib.Graphics/NativeGraphicsLoader.cs b/EOLib.Graphics/NativeGraphicsLoader.cs
@@ -8,22 +8,16 @@ namespace EOLib.Graphics
     [MappedType(BaseType = typeof(INativeGraphicsLoader), IsSingleton = true)]
     public class NativeGraphicsLoader : INativeGraphicsLoader
     {
-        private const int CULTURE_EN_US = 1033;
-
         private readonly IPEFileCollection _modules;
-        private readonly IConfigurationProvider _configurationProvider;
 
-        public NativeGraphicsLoader(IPEFileCollection modules,
-                                    IConfigurationProvider configurationProvider)
+        public NativeGraphicsLoader(IPEFileCollection modules)
         {
             _modules = modules;
-            _configurationProvider = configurationProvider;
         }
 
         public IImage LoadGFX(GFXTypes file, int resourceValue)
         {
-            var culture = _configurationProvider.MainCloneCompat ? CULTURE_EN_US : 0;
-            var fileBytes = _modules[file].GetEmbeddedBitmapResourceByID(resourceValue + 100, culture);
+            var fileBytes = _modules[file].GetEmbeddedBitmapResourceByID(resourceValue + 100);
 
             if (fileBytes.Length == 0)
                 throw new GFXLoadException(resourceValue, file);

diff --git a/EndlessClient/GameExecution/GameRunnerBase.cs b/EndlessClient/GameExecution/GameRunnerBase.cs
@@ -76,11 +76,6 @@ public virtual bool SetupDependencies()
 
                     i++;
                 }
-                else if(string.Equals(arg, "--clonecompat"))
-                {
-                    _registry.Resolve<IConfigurationRepository>()
-                        .MainCloneCompat = true;
-                }
                 else if (string.Equals(arg, "--version") && i < _args.Length - 1)
                 {
                     var versionStr = _args[i + 1];