diff --git a/PckStudio.Core/IO/Java/IMinecraftJavaVersion.cs b/JavaResourcePackConverter/Java/IMinecraftJavaVersion.cs similarity index 78% rename from PckStudio.Core/IO/Java/IMinecraftJavaVersion.cs rename to JavaResourcePackConverter/Java/IMinecraftJavaVersion.cs index c191510e..d76a5645 100644 --- a/PckStudio.Core/IO/Java/IMinecraftJavaVersion.cs +++ b/JavaResourcePackConverter/Java/IMinecraftJavaVersion.cs @@ -1,6 +1,6 @@ using System; -namespace PckStudio.Core.IO.Java +namespace JavaResourcePackConverter { interface IMinecraftJavaVersion : IEquatable { diff --git a/PckStudio.Core/IO/Java/ImportResult.cs b/JavaResourcePackConverter/Java/ImportResult.cs similarity index 88% rename from PckStudio.Core/IO/Java/ImportResult.cs rename to JavaResourcePackConverter/Java/ImportResult.cs index edaaf614..fab4e065 100644 --- a/PckStudio.Core/IO/Java/ImportResult.cs +++ b/JavaResourcePackConverter/Java/ImportResult.cs @@ -3,7 +3,7 @@ using System.Collections.Specialized; using System.Linq; using Newtonsoft.Json.Linq; -namespace PckStudio.Core.IO.Java +namespace JavaResourcePackConverter { public readonly struct ImportResult(TResult result, TStats stats) { diff --git a/PckStudio.Core/IO/Java/ImportStatusReport.cs b/JavaResourcePackConverter/Java/ImportStatusReport.cs similarity index 98% rename from PckStudio.Core/IO/Java/ImportStatusReport.cs rename to JavaResourcePackConverter/Java/ImportStatusReport.cs index b181bca8..a5770c36 100644 --- a/PckStudio.Core/IO/Java/ImportStatusReport.cs +++ b/JavaResourcePackConverter/Java/ImportStatusReport.cs @@ -6,7 +6,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace PckStudio.Core.IO.Java +namespace JavaResourcePackConverter { public class ImportStatusReport { diff --git a/PckStudio.Core/IO/Java/JavaConstants.cs b/JavaResourcePackConverter/Java/JavaConstants.cs similarity index 99% rename from PckStudio.Core/IO/Java/JavaConstants.cs rename to JavaResourcePackConverter/Java/JavaConstants.cs index 5326b582..c5c77ac8 100644 --- a/PckStudio.Core/IO/Java/JavaConstants.cs +++ b/JavaResourcePackConverter/Java/JavaConstants.cs @@ -6,7 +6,7 @@ using System.Text; using System.Threading.Tasks; using PckStudio.Core.Extensions; -namespace PckStudio.Core.IO.Java +namespace JavaResourcePackConverter { public class JavaConstants { diff --git a/PckStudio.Core/IO/Java/McPack.cs b/JavaResourcePackConverter/Java/McPack.cs similarity index 88% rename from PckStudio.Core/IO/Java/McPack.cs rename to JavaResourcePackConverter/Java/McPack.cs index 9fbf987a..c7294433 100644 --- a/PckStudio.Core/IO/Java/McPack.cs +++ b/JavaResourcePackConverter/Java/McPack.cs @@ -1,7 +1,7 @@ using System.Drawing; using Newtonsoft.Json; -namespace PckStudio.Core.IO.Java +namespace JavaResourcePackConverter { public struct McPack { diff --git a/PckStudio.Core/IO/Java/PointJsonConverter.cs b/JavaResourcePackConverter/Java/PointJsonConverter.cs similarity index 95% rename from PckStudio.Core/IO/Java/PointJsonConverter.cs rename to JavaResourcePackConverter/Java/PointJsonConverter.cs index 5b910d4f..77fc22bf 100644 --- a/PckStudio.Core/IO/Java/PointJsonConverter.cs +++ b/JavaResourcePackConverter/Java/PointJsonConverter.cs @@ -3,7 +3,7 @@ using System.Drawing; using Newtonsoft.Json; using Newtonsoft.Json.Linq; -namespace PckStudio.Core.IO.Java +namespace JavaResourcePackConverter { public class PointJsonConverter : JsonConverter { diff --git a/PckStudio.Core/IO/Java/ResourcePackImporter.cs b/JavaResourcePackConverter/Java/ResourcePackImporter.cs similarity index 96% rename from PckStudio.Core/IO/Java/ResourcePackImporter.cs rename to JavaResourcePackConverter/Java/ResourcePackImporter.cs index 0ae65120..63386eff 100644 --- a/PckStudio.Core/IO/Java/ResourcePackImporter.cs +++ b/JavaResourcePackConverter/Java/ResourcePackImporter.cs @@ -5,18 +5,22 @@ using System.Drawing; using System.IO; using System.IO.Compression; using System.Linq; +using System.Numerics; +using System.Xml.Linq; using Newtonsoft.Json; using Newtonsoft.Json.Linq; using OMI.Formats.Archive; using OMI.Formats.FUI; using OMI.Workers.FUI; +using PckStudio.Core; using PckStudio.Core.Deserializer; using PckStudio.Core.DLC; using PckStudio.Core.Extensions; +using PckStudio.Core.IO.Java; using PckStudio.Core.Json; using PckStudio.Core.Properties; -namespace PckStudio.Core.IO.Java +namespace JavaResourcePackConverter { public class ResourcePackImporter { @@ -25,32 +29,32 @@ namespace PckStudio.Core.IO.Java static readonly IReadOnlyDictionary _formatVeriosnToGameVersion = new Dictionary() { - [new (1, 0)] = new VersionRange("1.6.1", "1.8.9"), - [new (2, 0)] = new VersionRange("1.9", "1.10.2"), - [new (3, 0)] = new VersionRange("1.11", "1.12.2"), + [new(1, 0)] = new VersionRange("1.6.1", "1.8.9"), + [new(2, 0)] = new VersionRange("1.9", "1.10.2"), + [new(3, 0)] = new VersionRange("1.11", "1.12.2"), // ----- TARGET ----- // - [new (4, 0)] = new VersionRange("1.13", "1.14.4"), + [new(4, 0)] = new VersionRange("1.13", "1.14.4"), // ------------------ // - [new (5, 0)] = new VersionRange("1.15", "1.16.1"), - [new (6, 0)] = new VersionRange("1.16.2", "1.16.5"), - [new (7, 0)] = new VersionRange("1.17", "1.17.1"), - [new (8, 0)] = new VersionRange("1.18", "1.18.2"), - [new (9, 0)] = new VersionRange("1.19", "1.19.2"), - [new (12, 0)] = new SingleVersion("1.19.3"), - [new (13, 0)] = new SingleVersion("1.19.4"), - [new (15, 0)] = new VersionRange("1.20", "1.20.1"), - [new (18, 0)] = new SingleVersion("1.20.2"), - [new (22, 0)] = new VersionRange("1.20.3", "1.20.4"), - [new (32, 0)] = new VersionRange("1.20.5", "1.20.6"), - [new (34, 0)] = new VersionRange("1.21", "1.21.1"), - [new (42, 0)] = new VersionRange("1.21.2", "1.21.3"), - [new (46, 0)] = new SingleVersion("1.21.4"), - [new (55, 0)] = new SingleVersion("1.21.5"), - [new (63, 0)] = new SingleVersion("1.21.6"), - [new (64, 0)] = new VersionRange("1.21.7", "1.21.8"), - [new (69, 0)] = new VersionRange("1.21.9", "1.21.10"), + [new(5, 0)] = new VersionRange("1.15", "1.16.1"), + [new(6, 0)] = new VersionRange("1.16.2", "1.16.5"), + [new(7, 0)] = new VersionRange("1.17", "1.17.1"), + [new(8, 0)] = new VersionRange("1.18", "1.18.2"), + [new(9, 0)] = new VersionRange("1.19", "1.19.2"), + [new(12, 0)] = new SingleVersion("1.19.3"), + [new(13, 0)] = new SingleVersion("1.19.4"), + [new(15, 0)] = new VersionRange("1.20", "1.20.1"), + [new(18, 0)] = new SingleVersion("1.20.2"), + [new(22, 0)] = new VersionRange("1.20.3", "1.20.4"), + [new(32, 0)] = new VersionRange("1.20.5", "1.20.6"), + [new(34, 0)] = new VersionRange("1.21", "1.21.1"), + [new(42, 0)] = new VersionRange("1.21.2", "1.21.3"), + [new(46, 0)] = new SingleVersion("1.21.4"), + [new(55, 0)] = new SingleVersion("1.21.5"), + [new(63, 0)] = new SingleVersion("1.21.6"), + [new(64, 0)] = new VersionRange("1.21.7", "1.21.8"), + [new(69, 0)] = new VersionRange("1.21.9", "1.21.10"), }; public class TextureImportStats(int maxTextures) @@ -438,7 +442,7 @@ namespace PckStudio.Core.IO.Java }; } - private static string GetJavaGameVersionFromResourcePackFormat(int format) => _formatVeriosnToGameVersion.TryGetValue(new (format, 0), out IMinecraftJavaVersion versionRange) ? versionRange.ToString(" - ") : "unknown"; + private static string GetJavaGameVersionFromResourcePackFormat(int format) => _formatVeriosnToGameVersion.TryGetValue(new(format, 0), out IMinecraftJavaVersion versionRange) ? versionRange.ToString(" - ") : "unknown"; private static string GetAtlasPathFromFormat(int format, AtlasResource.AtlasType type) { @@ -724,11 +728,12 @@ namespace PckStudio.Core.IO.Java FourjUserInterface skinHud = new FourjUIReader().FromStream(new MemoryStream(Resources.skinHud)); - FourjUserInterface skinGraphicsHud = new FourjUIReader().FromStream(new MemoryStream(Resources.skinGraphicsHud)); + FourjUserInterface skinGraphicsInGame = new FourjUIReader().FromStream(new MemoryStream(Resources.skinGraphicsInGame)); FourjUserInterface skinPlatform = new FourjUIReader().FromStream(new MemoryStream(Resources.skinWiiU)); + // skinWiiU.fui if ( javaGui.TryGetValue("title/background/panorama_0.png", out ZipArchiveEntry panorama0Entry) && @@ -756,7 +761,7 @@ namespace PckStudio.Core.IO.Java { foreach (FuiTimelineEvent evnt in fui.GetEventTimeline(timeline.FindNamedEvent(name)).Frames[0].Events) { - System.Numerics.Matrix3x2 mat = evnt.Matrix; + Matrix3x2 mat = evnt.Matrix; mat.M11 /= scale.Width; mat.M22 /= scale.Height; evnt.Matrix = mat; @@ -783,13 +788,13 @@ namespace PckStudio.Core.IO.Java skinGraphicsHud.SetSymbol("hotbar_item_selected", hotbarItemSelectedTexture); skinGraphicsHud.SetSymbol("hotbar_offhand_slot", hotbarOffhandSlotTexture); - fjHotbarOffhandSlot.Frames[0].Events[0].Matrix = System.Numerics.Matrix3x2.CreateScale(2f / scale.Width, 2f / scale.Height); + fjHotbarOffhandSlot.Frames[0].Events[0].Matrix = Matrix3x2.CreateScale(2f / scale.Width, 2f / scale.Height); FuiTimelineEvent fuiTimelineEvent = hudTimeline.FindNamedEvent("HotBar"); FuiTimeline eventTimelineHotbar = skinHud.GetEventTimeline(fuiTimelineEvent); - eventTimelineHotbar.FindEventByReferenceId(refId: ref_index).Matrix = System.Numerics.Matrix3x2.CreateScale(3f / scale.Width, 3f / scale.Height); - eventTimelineHotbar.FindNamedEvent("HotbarSelector").Matrix *= System.Numerics.Matrix3x2.CreateScale(1f / scale.Width, 1f / scale.Height); + eventTimelineHotbar.FindEventByReferenceId(refId: ref_index).Matrix = Matrix3x2.CreateScale(3f / scale.Width, 3f / scale.Height); + eventTimelineHotbar.FindNamedEvent("HotbarSelector").Matrix *= Matrix3x2.CreateScale(1f / scale.Width, 1f / scale.Height); } // base size : 256x256 diff --git a/PckStudio.Core/IO/Java/SingleVersion.cs b/JavaResourcePackConverter/Java/SingleVersion.cs similarity index 91% rename from PckStudio.Core/IO/Java/SingleVersion.cs rename to JavaResourcePackConverter/Java/SingleVersion.cs index 3118575a..a43d73db 100644 --- a/PckStudio.Core/IO/Java/SingleVersion.cs +++ b/JavaResourcePackConverter/Java/SingleVersion.cs @@ -1,6 +1,6 @@ using System; -namespace PckStudio.Core.IO.Java +namespace JavaResourcePackConverter { class SingleVersion(Version version) : IMinecraftJavaVersion { diff --git a/PckStudio.Core/IO/Java/SizeJsonConverter.cs b/JavaResourcePackConverter/Java/SizeJsonConverter.cs similarity index 95% rename from PckStudio.Core/IO/Java/SizeJsonConverter.cs rename to JavaResourcePackConverter/Java/SizeJsonConverter.cs index a103fcb9..5710d986 100644 --- a/PckStudio.Core/IO/Java/SizeJsonConverter.cs +++ b/JavaResourcePackConverter/Java/SizeJsonConverter.cs @@ -3,7 +3,7 @@ using System.Drawing; using Newtonsoft.Json; using Newtonsoft.Json.Linq; -namespace PckStudio.Core.IO.Java +namespace JavaResourcePackConverter { public class SizeJsonConverter : JsonConverter { diff --git a/PckStudio.Core/IO/Java/SpecificVerions.cs b/JavaResourcePackConverter/Java/SpecificVerions.cs similarity index 91% rename from PckStudio.Core/IO/Java/SpecificVerions.cs rename to JavaResourcePackConverter/Java/SpecificVerions.cs index 94157bb8..9f1bf2ff 100644 --- a/PckStudio.Core/IO/Java/SpecificVerions.cs +++ b/JavaResourcePackConverter/Java/SpecificVerions.cs @@ -1,7 +1,7 @@ using System; using PckStudio.Core.Extensions; -namespace PckStudio.Core.IO.Java +namespace JavaResourcePackConverter { class SpecificVerions(params Version[] versions) : IMinecraftJavaVersion { diff --git a/PckStudio.Core/IO/Java/VersionRange.cs b/JavaResourcePackConverter/Java/VersionRange.cs similarity index 92% rename from PckStudio.Core/IO/Java/VersionRange.cs rename to JavaResourcePackConverter/Java/VersionRange.cs index d08cdbcb..4d866d5d 100644 --- a/PckStudio.Core/IO/Java/VersionRange.cs +++ b/JavaResourcePackConverter/Java/VersionRange.cs @@ -1,6 +1,6 @@ using System; -namespace PckStudio.Core.IO.Java +namespace JavaResourcePackConverter { class VersionRange(Version min, Version max) : IMinecraftJavaVersion { diff --git a/JavaResourcePackConverter/JavaResourcePackConverter.csproj b/JavaResourcePackConverter/JavaResourcePackConverter.csproj new file mode 100644 index 00000000..4b59840f --- /dev/null +++ b/JavaResourcePackConverter/JavaResourcePackConverter.csproj @@ -0,0 +1,77 @@ + + + + + Debug + AnyCPU + {9D4CE14A-0E13-44D7-A803-9F6E13B8A3B7} + Library + Properties + JavaResourcePackConverter + Latest + JavaResourcePackConverter + v4.8 + 512 + true + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {345eabed-f0d1-4d04-b409-babdef747352} + PckStudio.Core + + + {693aebc1-293d-4df0-bcae-26a1099fe7bb} + OMI Filetype Library + + + + + 13.0.3 + + + + \ No newline at end of file diff --git a/JavaResourcePackConverter/Properties/AssemblyInfo.cs b/JavaResourcePackConverter/Properties/AssemblyInfo.cs new file mode 100644 index 00000000..7873cde2 --- /dev/null +++ b/JavaResourcePackConverter/Properties/AssemblyInfo.cs @@ -0,0 +1,33 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("JavaResourcePackConverter")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("JavaResourcePackConverter")] +[assembly: AssemblyCopyright("Copyright © 2026")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: Guid("9d4ce14a-0e13-44d7-a803-9f6e13b8a3b7")] + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/PCK-Studio/Controls/JavaImportForm.cs b/PCK-Studio/Controls/JavaImportForm.cs index faf3fa55..3a9bb97f 100644 --- a/PCK-Studio/Controls/JavaImportForm.cs +++ b/PCK-Studio/Controls/JavaImportForm.cs @@ -9,6 +9,7 @@ using System.IO.Compression; using System.Linq; using System.Threading; using System.Windows.Forms; +using JavaResourcePackConverter; using PckStudio.Core; using PckStudio.Core.DLC; using PckStudio.Core.IO.Java; diff --git a/PCK-Studio/MainForm.cs b/PCK-Studio/MainForm.cs index ab4a2c2c..197376ac 100644 --- a/PCK-Studio/MainForm.cs +++ b/PCK-Studio/MainForm.cs @@ -8,6 +8,7 @@ using System.IO.Compression; using System.Linq; using System.Text.RegularExpressions; using System.Windows.Forms; +using JavaResourcePackConverter; using OMI.Formats.GameRule; using OMI.Formats.Languages; using OMI.Formats.Pck; @@ -21,7 +22,6 @@ using PckStudio.Core.App; using PckStudio.Core.DLC; using PckStudio.Core.Extensions; using PckStudio.Core.Interfaces; -using PckStudio.Core.IO.Java; using PckStudio.External.API.Miles; using PckStudio.Forms; using PckStudio.Forms.Additional_Popups; diff --git a/PCK-Studio/PckStudio.csproj b/PCK-Studio/PckStudio.csproj index 02325bc6..3babb2b7 100644 --- a/PCK-Studio/PckStudio.csproj +++ b/PCK-Studio/PckStudio.csproj @@ -752,6 +752,10 @@ + + {9d4ce14a-0e13-44d7-a803-9f6e13b8a3b7} + JavaResourcePackConverter + {345eabed-f0d1-4d04-b409-babdef747352} PckStudio.Core diff --git a/PCK_Studio.sln b/PCK_Studio.sln index 0505032a..2531a17a 100644 --- a/PCK_Studio.sln +++ b/PCK_Studio.sln @@ -17,6 +17,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PckStudio.Core", "PckStudio EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PckStudio.ModelSupport", "PckStudio.ModelSupport\PckStudio.ModelSupport.csproj", "{43BCACD7-5405-4499-9B45-E1435AC03C26}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JavaResourcePackConverter", "JavaResourcePackConverter\JavaResourcePackConverter.csproj", "{9D4CE14A-0E13-44D7-A803-9F6E13B8A3B7}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Misc", "Misc", "{02EA681E-C7D8-13C7-8484-4AC65E1B71E8}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Beta|Any CPU = Beta|Any CPU @@ -138,6 +142,24 @@ Global {43BCACD7-5405-4499-9B45-E1435AC03C26}.Release|x64.Build.0 = Release|Any CPU {43BCACD7-5405-4499-9B45-E1435AC03C26}.Release|x86.ActiveCfg = Release|Any CPU {43BCACD7-5405-4499-9B45-E1435AC03C26}.Release|x86.Build.0 = Release|Any CPU + {9D4CE14A-0E13-44D7-A803-9F6E13B8A3B7}.Beta|Any CPU.ActiveCfg = Debug|Any CPU + {9D4CE14A-0E13-44D7-A803-9F6E13B8A3B7}.Beta|Any CPU.Build.0 = Debug|Any CPU + {9D4CE14A-0E13-44D7-A803-9F6E13B8A3B7}.Beta|x64.ActiveCfg = Debug|Any CPU + {9D4CE14A-0E13-44D7-A803-9F6E13B8A3B7}.Beta|x64.Build.0 = Debug|Any CPU + {9D4CE14A-0E13-44D7-A803-9F6E13B8A3B7}.Beta|x86.ActiveCfg = Debug|Any CPU + {9D4CE14A-0E13-44D7-A803-9F6E13B8A3B7}.Beta|x86.Build.0 = Debug|Any CPU + {9D4CE14A-0E13-44D7-A803-9F6E13B8A3B7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9D4CE14A-0E13-44D7-A803-9F6E13B8A3B7}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9D4CE14A-0E13-44D7-A803-9F6E13B8A3B7}.Debug|x64.ActiveCfg = Debug|Any CPU + {9D4CE14A-0E13-44D7-A803-9F6E13B8A3B7}.Debug|x64.Build.0 = Debug|Any CPU + {9D4CE14A-0E13-44D7-A803-9F6E13B8A3B7}.Debug|x86.ActiveCfg = Debug|Any CPU + {9D4CE14A-0E13-44D7-A803-9F6E13B8A3B7}.Debug|x86.Build.0 = Debug|Any CPU + {9D4CE14A-0E13-44D7-A803-9F6E13B8A3B7}.Release|Any CPU.ActiveCfg = Release|Any CPU + {9D4CE14A-0E13-44D7-A803-9F6E13B8A3B7}.Release|Any CPU.Build.0 = Release|Any CPU + {9D4CE14A-0E13-44D7-A803-9F6E13B8A3B7}.Release|x64.ActiveCfg = Release|Any CPU + {9D4CE14A-0E13-44D7-A803-9F6E13B8A3B7}.Release|x64.Build.0 = Release|Any CPU + {9D4CE14A-0E13-44D7-A803-9F6E13B8A3B7}.Release|x86.ActiveCfg = Release|Any CPU + {9D4CE14A-0E13-44D7-A803-9F6E13B8A3B7}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -145,6 +167,7 @@ Global GlobalSection(NestedProjects) = preSolution {693AEBC1-293D-4DF0-BCAE-26A1099FE7BB} = {FC87F3E5-B07E-4FFB-889F-66FA3A3CFCAA} {E8D0B671-3AB1-48B6-A767-58DF67BD5D11} = {FC87F3E5-B07E-4FFB-889F-66FA3A3CFCAA} + {9D4CE14A-0E13-44D7-A803-9F6E13B8A3B7} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {9A3BF1FB-950F-401E-9F58-EA7BBADCE6F2} diff --git a/PckStudio.Core/Atlas/Atlas.cs b/PckStudio.Core/Atlas/Atlas.cs index 6217b55a..ccb51cdf 100644 --- a/PckStudio.Core/Atlas/Atlas.cs +++ b/PckStudio.Core/Atlas/Atlas.cs @@ -290,7 +290,7 @@ namespace PckStudio.Core return true; } - internal static Atlas CreateDefault(AtlasResource atlasResource, LCEGameVersion gameVersion) + public static Atlas CreateDefault(AtlasResource atlasResource, LCEGameVersion gameVersion) { Image defaultAtlas = atlasResource.Type switch { diff --git a/PckStudio.Core/DLC/DLCTexturePackage.cs b/PckStudio.Core/DLC/DLCTexturePackage.cs index e2b89950..87a872f1 100644 --- a/PckStudio.Core/DLC/DLCTexturePackage.cs +++ b/PckStudio.Core/DLC/DLCTexturePackage.cs @@ -85,7 +85,7 @@ namespace PckStudio.Core.DLC //! TODO: add resources from "res/misc/" private readonly IDictionary _misc; - internal DLCTexturePackage( + public DLCTexturePackage( string name, string description, int identifier, diff --git a/PckStudio.Core/Extensions/StringExtensions.cs b/PckStudio.Core/Extensions/StringExtensions.cs index bff8d435..042d2620 100644 --- a/PckStudio.Core/Extensions/StringExtensions.cs +++ b/PckStudio.Core/Extensions/StringExtensions.cs @@ -6,7 +6,7 @@ using System.Threading.Tasks; namespace PckStudio.Core.Extensions { - internal static class StringExtensions + public static class StringExtensions { public static string End(this string str, int count) diff --git a/PckStudio.Core/IO/Java/McMeta.cs b/PckStudio.Core/IO/McMeta.cs similarity index 100% rename from PckStudio.Core/IO/Java/McMeta.cs rename to PckStudio.Core/IO/McMeta.cs diff --git a/PckStudio.Core/PckStudio.Core.csproj b/PckStudio.Core/PckStudio.Core.csproj index 3e5efd32..34b4705c 100644 --- a/PckStudio.Core/PckStudio.Core.csproj +++ b/PckStudio.Core/PckStudio.Core.csproj @@ -56,19 +56,8 @@ - - - - - - - - - - + - - diff --git a/Vendor/OMI-Lib b/Vendor/OMI-Lib index 2acd3191..dcc51220 160000 --- a/Vendor/OMI-Lib +++ b/Vendor/OMI-Lib @@ -1 +1 @@ -Subproject commit 2acd3191b132c67445d5a50cd3f2ec6be37c8d9b +Subproject commit dcc51220dc9d4a6847938812fadae670acbec16c