diff --git a/annotations/src/main/java/mindustry/annotations/impl/AssetsProcess.java b/annotations/src/main/java/mindustry/annotations/impl/AssetsProcess.java index fb5d4d4b04..8c98cb9401 100644 --- a/annotations/src/main/java/mindustry/annotations/impl/AssetsProcess.java +++ b/annotations/src/main/java/mindustry/annotations/impl/AssetsProcess.java @@ -123,7 +123,7 @@ public class AssetsProcess extends BaseProcessor{ if(SourceVersion.isKeyword(name)) name += "s"; String filepath = path.substring(path.lastIndexOf("/") + 1) + "/" + fname; - String filename = "arc.Core.app.getType() != arc.Application.ApplicationType.iOS ? \"" + filepath + "\" : \"" + filepath.replace(".ogg", ".mp3") + "\""; + String filename = "\"" + filepath + "\""; loadBegin.addStatement("arc.Core.assets.load(" + filename + ", " + rtype + ".class).loaded = a -> " + name + " = (" + rtype + ")a", filepath, filepath.replace(".ogg", ".mp3")); diff --git a/ios/build.gradle b/ios/build.gradle index c3a34b63b6..afd306a656 100644 --- a/ios/build.gradle +++ b/ios/build.gradle @@ -14,22 +14,6 @@ task copyAssets(){ from "../core/assets" into "assets/" } - - exec{ - ignoreExitValue true - commandLine "sh", "./convert_audio.sh", "assets/sounds" - } - - exec{ - ignoreExitValue true - commandLine "sh", "./convert_audio.sh", "assets/music" - } - - delete{ - delete fileTree('assets'){ - include '**/*.ogg' - } - } } }