diff --git a/PCK-Studio/Internal/ApplicationScope.cs b/PCK-Studio/Internal/ApplicationScope.cs index 61efd6d4..998178df 100644 --- a/PCK-Studio/Internal/ApplicationScope.cs +++ b/PCK-Studio/Internal/ApplicationScope.cs @@ -21,7 +21,7 @@ namespace PckStudio.Internal { Profiler.Start(); { - _entityImages ??= Resources.entities_sheet.SplitHorizontal(32).ToArray(); + _entityImages ??= Resources.entities_atlas.SplitHorizontal(32).ToArray(); DataCacher ??= new FileCacher(Program.AppDataCache); _ = Tiles.JsonBlockData; _ = Tiles.JsonItemData; diff --git a/PCK-Studio/Internal/Json/Tiles.cs b/PCK-Studio/Internal/Json/Tiles.cs index a973638b..2c026335 100644 --- a/PCK-Studio/Internal/Json/Tiles.cs +++ b/PCK-Studio/Internal/Json/Tiles.cs @@ -63,28 +63,28 @@ namespace PckStudio.Internal.Json internal static List ExplosionTileInfos => JsonExplosionData.Explosion; private static Image[] _itemImages; - public static Image[] ItemImages => _itemImages ??= Resources.items_sheet.SplitHorizontal(16).ToArray(); + public static Image[] ItemImages => _itemImages ??= Resources.items_atlas.SplitHorizontal(16).ToArray(); private static Image[] _blockImages; - public static Image[] BlockImages => _blockImages ??= Resources.terrain_sheet.SplitHorizontal(16).ToArray(); + public static Image[] BlockImages => _blockImages ??= Resources.terrain_atlas.SplitHorizontal(16).ToArray(); private static Image[] _particleImages; - public static Image[] ParticleImages => _particleImages ??= Resources.particles_sheet.SplitHorizontal(16).ToArray(); + public static Image[] ParticleImages => _particleImages ??= Resources.particles_atlas.SplitHorizontal(16).ToArray(); private static Image[] _moonPhaseImages; - public static Image[] MoonPhaseImages => _moonPhaseImages ??= Resources.moon_phases_sheet.SplitHorizontal(4).ToArray(); + public static Image[] MoonPhaseImages => _moonPhaseImages ??= Resources.moon_phases_atlas.SplitHorizontal(4).ToArray(); private static Image[] _mapIconImages; - public static Image[] MapIconImages => _mapIconImages ??= Resources.map_icons_sheet.SplitHorizontal(4).ToArray(); + public static Image[] MapIconImages => _mapIconImages ??= Resources.map_icons_atlas.SplitHorizontal(4).ToArray(); private static Image[] _additionalMapIconImages; - public static Image[] AdditionalMapIconImages => _additionalMapIconImages ??= Resources.additional_map_icons_sheet.SplitHorizontal(4).ToArray(); + public static Image[] AdditionalMapIconImages => _additionalMapIconImages ??= Resources.additional_map_icons_atlas.SplitHorizontal(4).ToArray(); private static Image[] _experienceOrbIconImages; - public static Image[] ExperienceOrbImages => _experienceOrbIconImages ??= Resources.experience_orbs_sheet.SplitHorizontal(4).ToArray(); + public static Image[] ExperienceOrbImages => _experienceOrbIconImages ??= Resources.experience_orbs_atlas.SplitHorizontal(4).ToArray(); private static Image[] _explosionImages; - public static Image[] ExplosionImages => _explosionImages ??= Resources.explosion_sheet.SplitHorizontal(4).ToArray(); + public static Image[] ExplosionImages => _explosionImages ??= Resources.explosion_atlas.SplitHorizontal(4).ToArray(); private static ImageList GetImageList(Image[] images) { diff --git a/PCK-Studio/PckStudio.csproj b/PCK-Studio/PckStudio.csproj index de86f119..ce2935ae 100644 --- a/PCK-Studio/PckStudio.csproj +++ b/PCK-Studio/PckStudio.csproj @@ -636,7 +636,6 @@ - diff --git a/PCK-Studio/Properties/Resources.Designer.cs b/PCK-Studio/Properties/Resources.Designer.cs index 97f21855..abd4c5f3 100644 --- a/PCK-Studio/Properties/Resources.Designer.cs +++ b/PCK-Studio/Properties/Resources.Designer.cs @@ -73,9 +73,9 @@ namespace PckStudio.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - public static System.Drawing.Bitmap additional_map_icons_sheet { + public static System.Drawing.Bitmap additional_map_icons_atlas { get { - object obj = ResourceManager.GetObject("additional_map_icons_sheet", resourceCulture); + object obj = ResourceManager.GetObject("additional_map_icons_atlas", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -277,9 +277,9 @@ namespace PckStudio.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - public static System.Drawing.Bitmap entities_sheet { + public static System.Drawing.Bitmap entities_atlas { get { - object obj = ResourceManager.GetObject("entities_sheet", resourceCulture); + object obj = ResourceManager.GetObject("entities_atlas", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -329,9 +329,9 @@ namespace PckStudio.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - public static System.Drawing.Bitmap experience_orbs_sheet { + public static System.Drawing.Bitmap experience_orbs_atlas { get { - object obj = ResourceManager.GetObject("experience_orbs_sheet", resourceCulture); + object obj = ResourceManager.GetObject("experience_orbs_atlas", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -369,9 +369,9 @@ namespace PckStudio.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - public static System.Drawing.Bitmap explosion_sheet { + public static System.Drawing.Bitmap explosion_atlas { get { - object obj = ResourceManager.GetObject("explosion_sheet", resourceCulture); + object obj = ResourceManager.GetObject("explosion_atlas", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -538,9 +538,9 @@ namespace PckStudio.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - public static System.Drawing.Bitmap items_sheet { + public static System.Drawing.Bitmap items_atlas { get { - object obj = ResourceManager.GetObject("items_sheet", resourceCulture); + object obj = ResourceManager.GetObject("items_atlas", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -558,9 +558,9 @@ namespace PckStudio.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - public static System.Drawing.Bitmap map_icons_sheet { + public static System.Drawing.Bitmap map_icons_atlas { get { - object obj = ResourceManager.GetObject("map_icons_sheet", resourceCulture); + object obj = ResourceManager.GetObject("map_icons_atlas", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -615,9 +615,9 @@ namespace PckStudio.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - public static System.Drawing.Bitmap moon_phases_sheet { + public static System.Drawing.Bitmap moon_phases_atlas { get { - object obj = ResourceManager.GetObject("moon_phases_sheet", resourceCulture); + object obj = ResourceManager.GetObject("moon_phases_atlas", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -730,9 +730,9 @@ namespace PckStudio.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - public static System.Drawing.Bitmap particles_sheet { + public static System.Drawing.Bitmap particles_atlas { get { - object obj = ResourceManager.GetObject("particles_sheet", resourceCulture); + object obj = ResourceManager.GetObject("particles_atlas", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -870,9 +870,9 @@ namespace PckStudio.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - public static System.Drawing.Bitmap terrain_sheet { + public static System.Drawing.Bitmap terrain_atlas { get { - object obj = ResourceManager.GetObject("terrain_sheet", resourceCulture); + object obj = ResourceManager.GetObject("terrain_atlas", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } diff --git a/PCK-Studio/Properties/Resources.resx b/PCK-Studio/Properties/Resources.resx index cda749a2..2fcf9388 100644 --- a/PCK-Studio/Properties/Resources.resx +++ b/PCK-Studio/Properties/Resources.resx @@ -223,7 +223,7 @@ ..\Resources\iconImageList\INFO ICON.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - + ..\Resources\atlases\terrain.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -232,7 +232,7 @@ ..\Resources\icons\clock.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - + ..\Resources\atlases\items.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -277,7 +277,7 @@ ..\Resources\iconImageList\blank.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - + ..\Resources\atlases\entities.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -325,16 +325,16 @@ ..\..\ProjectLogo.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - + ..\Resources\atlases\moon_phases.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - + ..\Resources\atlases\additional_mapicons.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - + ..\Resources\atlases\map_icons.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - + ..\Resources\atlases\experience_orbs.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -346,7 +346,7 @@ ..\Resources\atlases\explosionData.json;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252 - + ..\Resources\atlases\explosion.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -361,7 +361,7 @@ ..\Resources\atlases\particleData.json;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252 - + ..\Resources\atlases\particles.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a \ No newline at end of file