diff --git a/AM2RPortHelperLib/RawMods.cs b/AM2RPortHelperLib/RawMods.cs index f1dd535..b842aff 100644 --- a/AM2RPortHelperLib/RawMods.cs +++ b/AM2RPortHelperLib/RawMods.cs @@ -239,6 +239,7 @@ public abstract class RawMods : ModsBase string apkAssetsDir = apkDir + "/assets"; string bin = RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? "cmd.exe" : "java"; string args = RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? "/C java -jar " : "-jar "; + string apktool = CurrentDir + "/utils/apktool.jar"; string signer = CurrentDir + "/utils/uber-apk-signer.jar"; string signedApkBuild = extractDirectory + "/build-aligned-debugSigned.apk"; @@ -246,10 +247,18 @@ public abstract class RawMods : ModsBase if (Directory.Exists(extractDirectory)) Directory.Delete(extractDirectory, true); Directory.CreateDirectory(extractDirectory); - - // Extract the apk - outputDelegate.SendOutput("Extracting apk..."); - ZipFile.ExtractToDirectory(UtilDir + "/AM2RWrapper.apk", apkDir); + + // Run APKTOOL and decompress the file + outputDelegate.SendOutput("Decompiling apk..."); + ProcessStartInfo pStartInfo = new ProcessStartInfo + { + FileName = bin, + Arguments = args + "\"" + apktool + "\" d -f -o \"" + apkDir + "\" \"" + UtilDir + "/AM2RWrapper.apk" + "\"", + CreateNoWindow = true + }; + Process p = new Process { StartInfo = pStartInfo }; + p.Start(); + p.WaitForExit(); outputDelegate.SendOutput("Extracting for Raw Android..."); ZipFile.ExtractToDirectory(inputRawZipPath, apkAssetsDir); @@ -288,6 +297,12 @@ public abstract class RawMods : ModsBase //recursively lowercase everything in the assets folder outputDelegate.SendOutput("Lowercase everything in the assets folder..."); HelperMethods.LowercaseFolder(apkAssetsDir); + + // Edit apktool.yml to not compress music + outputDelegate.SendOutput("Edit settings file to not compress OGGs..."); + string yamlFile = File.ReadAllText(apkDir + "/apktool.yml"); + yamlFile = yamlFile.Replace("doNotCompress:", "doNotCompress:\n- ogg"); + File.WriteAllText(apkDir + "/apktool.yml", yamlFile); outputDelegate.SendOutput("Save new icons"); // Edit the icons in the apk. Wrapper always has these, so we need to overwrite these too. @@ -368,32 +383,27 @@ public abstract class RawMods : ModsBase File.WriteAllText(apkDir + "/AndroidManifest.xml", manifestFile); } - // First we zip everything. Then we go through each ogg file, delete it first, create the entry again with a "STORE" flag, and then write its contents there - // TODO: probably more efficient to just manually create the zip for each entry? + // Run APKTOOL and build the apk outputDelegate.SendOutput("Rebuild apk..."); - string apkBuild = extractDirectory + "/build.apk"; - ZipFile.CreateFromDirectory(apkDir, apkBuild); - outputDelegate.SendOutput("Replace each ogg..."); - using (ZipArchive archive = new ZipArchive(new FileStream(apkBuild, FileMode.Open), ZipArchiveMode.Update)) + pStartInfo = new ProcessStartInfo { - foreach (var file in new DirectoryInfo(apkAssetsDir).GetFiles().Where(f => f.Extension == ".ogg")) - { - archive.Entries.First(n => n.FullName == "assets/" + file.Name).Delete(); - var entry = archive.CreateEntry("assets/" + file.Name, CompressionLevel.NoCompression); - using var writer = entry.Open(); - writer.Write(File.ReadAllBytes(file.FullName)); - } - } + FileName = bin, + Arguments = args + "\"" + apktool + "\" b \"" + apkDir + "\" -o \"" + extractDirectory + "/build.apk" + "\"", + CreateNoWindow = true + }; + p = new Process { StartInfo = pStartInfo }; + p.Start(); + p.WaitForExit(); // Sign the apk outputDelegate.SendOutput("Sign apk..."); - ProcessStartInfo pStartInfo = new ProcessStartInfo + pStartInfo = new ProcessStartInfo { FileName = bin, - Arguments = args + "\"" + signer + "\" -a \"" + apkBuild + "\"", + Arguments = args + "\"" + signer + "\" -a \"" + extractDirectory + "/build.apk" + "\"", CreateNoWindow = true }; - Process p = new Process { StartInfo = pStartInfo }; + p = new Process { StartInfo = pStartInfo }; p.Start(); p.WaitForExit(); @@ -542,13 +552,15 @@ public abstract class RawMods : ModsBase { if (Data is null) return; + string game_name = Data.GeneralInfo.Name.Content; + void ScriptMessage(string s) => output(s); if (!Data.FORM.Chunks.ContainsKey("AGRP")) { throw new NotSupportedException("Bytecode 13 is not supported."); } - byte? bcVersion = Data.GeneralInfo.BytecodeVersion; + byte? bcVersion = Data?.GeneralInfo.BytecodeVersion; if (bcVersion == 14) { throw new NotSupportedException("Bytecode 14 is not supported."); @@ -559,8 +571,9 @@ public abstract class RawMods : ModsBase } if (!((Data.GMS2_3 == false) && (Data.GMS2_3_1 == false) && (Data.GMS2_3_2 == false))) { - throw new NotSupportedException("GMS 2.3+ is unsupported"); + throw new NotSupportedException(game_name + "is GMS 2.3+ and is ineligible"); } + if (bcVersion != 14 && bcVersion != 15 && bcVersion != 16) { throw new NotSupportedException("Unknown Bytecode version!"); @@ -636,15 +649,15 @@ public abstract class RawMods : ModsBase var newProductID = new byte[] { 0xBA, 0x5E, 0xBA, 0x11, 0xBA, 0xDD, 0x06, 0x60, 0xBE, 0xEF, 0xED, 0xBA, 0x0B, 0xAB, 0xBA, 0xBE }; Data.FORM.EXTN.productIdData.Add(newProductID); Data.Options.Constants.Clear(); - Data.Options.Constants.Add(new UndertaleOptions.Constant { Name = Data.Strings.MakeString("@@SleepMargin"), Value = Data.Strings.MakeString(1.ToString()) }); - Data.Options.Constants.Add(new UndertaleOptions.Constant { Name = Data.Strings.MakeString("@@DrawColour"), Value = Data.Strings.MakeString(0xFFFFFFFF.ToString()) }); + Data.Options.Constants.Add(new UndertaleOptions.Constant() { Name = Data.Strings.MakeString("@@SleepMargin"), Value = Data.Strings.MakeString(1.ToString()) }); + Data.Options.Constants.Add(new UndertaleOptions.Constant() { Name = Data.Strings.MakeString("@@DrawColour"), Value = Data.Strings.MakeString(0xFFFFFFFF.ToString()) }); } Data.FORM.Chunks["LANG"] = new UndertaleChunkLANG(); Data.FORM.LANG.Object = new UndertaleLanguage(); Data.FORM.Chunks["GLOB"] = new UndertaleChunkGLOB(); - string[] order = { "GEN8", "OPTN", "LANG", "EXTN", "SOND", "AGRP", "SPRT", "BGND", "PATH", "SCPT", "GLOB", "SHDR", "FONT", "TMLN", "OBJT", "ROOM", "DAFL", "TPAG", "CODE", "VARI", "FUNC", "STRG", "TXTR", "AUDO" }; + String[] order = { "GEN8", "OPTN", "LANG", "EXTN", "SOND", "AGRP", "SPRT", "BGND", "PATH", "SCPT", "GLOB", "SHDR", "FONT", "TMLN", "OBJT", "ROOM", "DAFL", "TPAG", "CODE", "VARI", "FUNC", "STRG", "TXTR", "AUDO" }; Dictionary newChunks = new Dictionary(); - foreach (string name in order) + foreach (String name in order) newChunks[name] = Data.FORM.Chunks[name]; Data.FORM.Chunks = newChunks; Data.GeneralInfo.BytecodeVersion = 16; diff --git a/AM2RPortHelperLib/utils/apktool-LICENSE b/AM2RPortHelperLib/utils/apktool-LICENSE new file mode 100644 index 0000000..96447c9 --- /dev/null +++ b/AM2RPortHelperLib/utils/apktool-LICENSE @@ -0,0 +1,207 @@ +Sub projects brut.apktool, brut.j.common, brut.dir and brut.j.util are +released under the following license: + +******************************************************************************* + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +******************************************************************************* diff --git a/AM2RPortHelperLib/utils/apktool.jar b/AM2RPortHelperLib/utils/apktool.jar new file mode 100644 index 0000000..a07b3d7 Binary files /dev/null and b/AM2RPortHelperLib/utils/apktool.jar differ