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

Status effect cleanup

Browse Source
This commit is contained in:
Anuken
2019-12-09 22:08:22 -05:00
parent 2a03ef0c43
commit da849085ec
5 changed files with 84 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -67,7 +67,7 @@ public class AndroidLauncher extends AndroidApplication{
@Override
public org.mozilla.javascript.Context getScriptContext(){
return AndroidRhinoContext.enterContext(getContext().getCacheDir());
return AndroidRhinoContext.enter(getContext().getCacheDir());
}
@Override

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

@@ -12,8 +12,6 @@ import com.android.dx.merge.*;
import dalvik.system.*;
import io.anuke.arc.*;
import io.anuke.arc.backends.android.surfaceview.*;
import io.anuke.arc.util.ArcAnnotate.NonNull;
import io.anuke.arc.util.ArcAnnotate.Nullable;
import io.anuke.mindustry.AndroidRhinoContext.BaseAndroidClassLoader.*;
import org.mozilla.javascript.*;
@@ -31,7 +29,7 @@ public class AndroidRhinoContext{
* call this instead of {@link Context#enter()}
* @return a context prepared for android
*/
public static Context enterContext(File cacheDirectory){
public static Context enter(File cacheDirectory){
if(!SecurityController.hasGlobal())
SecurityController.initGlobal(new SecurityController(){
@Override
@@ -172,7 +170,7 @@ public class AndroidRhinoContext{
}
@Override
protected Class<?> loadClass(@NonNull Dex dex, @NonNull String name) throws ClassNotFoundException{
protected Class<?> loadClass(Dex dex, String name) throws ClassNotFoundException{
try{
dex.writeTo(dexFile);
}catch(IOException e){
@@ -181,7 +179,6 @@ public class AndroidRhinoContext{
return new DexClassLoader(dexFile.getPath(), ((AndroidApplication)Core.app).getContext().getCacheDir().getAbsolutePath(), null, getParent()).loadClass(name);
}
@Nullable
@Override
protected Dex getLastDex(){
if(dexFile.exists()){
@@ -202,19 +199,18 @@ public class AndroidRhinoContext{
@TargetApi(Build.VERSION_CODES.O)
static class InMemoryAndroidClassLoader extends BaseAndroidClassLoader{
@Nullable private Dex last;
private Dex last;
public InMemoryAndroidClassLoader(ClassLoader parent){
super(parent);
}
@Override
protected Class<?> loadClass(@NonNull Dex dex, @NonNull String name) throws ClassNotFoundException{
protected Class<?> loadClass(Dex dex, String name) throws ClassNotFoundException{
last = dex;
return new InMemoryDexClassLoader(ByteBuffer.wrap(dex.getBytes()), getParent()).loadClass(name);
}
@Nullable
@Override
protected Dex getLastDex(){
return last;