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

Fixed some Android-related script issues

Browse Source
This commit is contained in:
Anuken
2019-12-14 11:04:22 -05:00
parent 252d0f6aa1
commit c1cf3183ac
2 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
android/src/io/anuke/mindustry/AndroidRhinoContext.java
View File

@@ -13,7 +13,6 @@ import com.android.dx.merge.*;
import dalvik.system.*; import dalvik.system.*;
import io.anuke.arc.*; import io.anuke.arc.*;
import io.anuke.arc.backends.android.surfaceview.*; import io.anuke.arc.backends.android.surfaceview.*;
import io.anuke.arc.util.*;
import org.mozilla.javascript.*; import org.mozilla.javascript.*;
import java.io.*; import java.io.*;
@@ -180,7 +179,6 @@ public class AndroidRhinoContext{
e.printStackTrace(); e.printStackTrace();
} }
android.content.Context context = ((AndroidApplication)Core.app).getContext(); android.content.Context context = ((AndroidApplication)Core.app).getContext();
Log.info(dexFile.getPath() + " " + dexFile.exists() + " " + context.getCacheDir().getAbsolutePath());
return new DexClassLoader(dexFile.getPath(), VERSION.SDK_INT >= 21 ? context.getCodeCacheDir().getPath() : context.getCacheDir().getAbsolutePath(), null, getParent()).loadClass(name); return new DexClassLoader(dexFile.getPath(), VERSION.SDK_INT >= 21 ? context.getCodeCacheDir().getPath() : context.getCacheDir().getAbsolutePath(), null, getParent()).loadClass(name);
} }

2
core/src/io/anuke/mindustry/mod/Mods.java
View File

@@ -383,7 +383,7 @@ public class Mods implements Loadable{
Events.fire(new ContentReloadEvent()); Events.fire(new ContentReloadEvent());
if(scripts != null && scripts.hasErrored()){ if(scripts != null && scripts.hasErrored()){
Core.app.post(() -> Core.settings.getBoolOnce("scripts-errored", () -> ui.showErrorMessage("$mod.scripts.unsupported"))); Core.app.post(() -> ui.showErrorMessage("$mod.scripts.unsupported"));
} }
} }