diff --git a/app_2009scape/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java b/app_2009scape/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java index 6c2024a91..aac6f6b53 100644 --- a/app_2009scape/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java +++ b/app_2009scape/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java @@ -212,17 +212,6 @@ public class PojavLoginActivity extends BaseActivity { mkdirs(Tools.CTRLMAP_PATH); try { Tools.copyAssetFile(this, "components/security/pro-grade.jar", Tools.DIR_DATA, true); - - // Unpack Music - for(int i = 0; i < 645; i++){ - Tools.copyAssetFile(this, "music/"+i+".ogg", Tools.DIR_DATA + "/music", true); - } - - // Unpack Effects - for(int i = 0; i < 6749; i++){ - Tools.copyAssetFile(this, "effects/"+i+".ogg", Tools.DIR_DATA + "/effects", true); - } - Tools.copyAssetFile(this, "components/security/java_sandbox.policy", Tools.DIR_DATA, true); Tools.copyAssetFile(this, "options.txt", Tools.DIR_GAME_NEW, false); // TODO: Remove after implement. @@ -244,7 +233,7 @@ public class PojavLoginActivity extends BaseActivity { } } private boolean installRuntimeAutomatically(AssetManager am, boolean otherRuntimesAvailable) { - /* Check if JRE is included */ + /* Check if JRE is included, This only runs on first startup. */ String rt_version = null; String current_rt_version = MultiRTUtils.__internal__readBinpackVersion("Internal"); try { @@ -260,6 +249,20 @@ public class PojavLoginActivity extends BaseActivity { (resid, vararg) -> runOnUiThread(()->{if(startupTextView!=null)startupTextView.setText(getString(resid,vararg));})); MultiRTUtils.postPrepare(PojavLoginActivity.this,"Internal"); + try{ + // Unpack Music + for(int i = 0; i < 645; i++){ + Tools.copyAssetFile(this, "music/"+i+".ogg", Tools.DIR_DATA + "/music", true); + } + // Unpack Effects + for(int i = 0; i < 6749; i++){ + Tools.copyAssetFile(this, "effects/"+i+".ogg", Tools.DIR_DATA + "/effects", true); + } + } + catch (Exception e){ + System.out.println("Error Unpacking Music."); + } + // Copy config.json to writable storage // https://stackoverflow.com/questions/38590996/copy-xml-from-raw-folder-to-internal-storage-and-use-it-in-android File file = new File(getFilesDir(), "raw/config.json"); diff --git a/app_2009scape/src/main/java/net/kdt/pojavlaunch/utils/JMessageHandler.java b/app_2009scape/src/main/java/net/kdt/pojavlaunch/utils/JMessageHandler.java index 9410e0d15..5f5e0e369 100644 --- a/app_2009scape/src/main/java/net/kdt/pojavlaunch/utils/JMessageHandler.java +++ b/app_2009scape/src/main/java/net/kdt/pojavlaunch/utils/JMessageHandler.java @@ -15,7 +15,7 @@ public class JMessageHandler { break; case "NEW_EFFECT": // EXAMPLE: AMESSAGE NEW_EFFECT EFFECT_ID: 2555 EFFECT_VOLUME: 10 EFFECT_DELAY: 0 - JAudioManager.setEffectVolume(Integer.valueOf(args[5])/10f); + JAudioManager.setEffectVolume(Float.valueOf(args[5])/10f); JAudioManager.setEffectTrack(Integer.valueOf(args[3])); break; case "MUSIC_VOLUME": @@ -24,7 +24,7 @@ public class JMessageHandler { break; case "EFFECT_VOLUME": // EXAMPLE: AMESSAGE EFFECT_VOLUME: 10 - JAudioManager.setEffectVolume(Integer.valueOf(args[2])/10f); + JAudioManager.setEffectVolume(Float.valueOf(args[2])/10f); break; } } diff --git a/app_2009scape/src/main/res/raw/miniclient.jar b/app_2009scape/src/main/res/raw/miniclient.jar index 8185ef77c..7168f3b02 100644 Binary files a/app_2009scape/src/main/res/raw/miniclient.jar and b/app_2009scape/src/main/res/raw/miniclient.jar differ