Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

But does the iOS version need MP3s now?

Browse Source
This commit is contained in:
Anuken
2020-11-11 11:22:41 -05:00
parent f5ffee54ac
commit eba559d0ff
2 changed files with 1 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
annotations/src/main/java/mindustry/annotations/impl/AssetsProcess.java
View File

@@ -123,7 +123,7 @@ public class AssetsProcess extends BaseProcessor{
if(SourceVersion.isKeyword(name)) name += "s"; if(SourceVersion.isKeyword(name)) name += "s";
String filepath = path.substring(path.lastIndexOf("/") + 1) + "/" + fname; 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")); loadBegin.addStatement("arc.Core.assets.load(" + filename + ", " + rtype + ".class).loaded = a -> " + name + " = (" + rtype + ")a", filepath, filepath.replace(".ogg", ".mp3"));

16
ios/build.gradle
View File

@@ -14,22 +14,6 @@ task copyAssets(){
from "../core/assets" from "../core/assets"
into "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'
}
}
} }
} }