Anuken/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2024-10-26 09:13:28 +03:00
Code Issues Projects Releases Wiki Activity

Switched to rhino fork

Browse Source
This commit is contained in:
Anuken 2020-06-15 23:22:14 -04:00
parent caea5c7df2
commit 1eaa1a05ac
6 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@ -13,7 +13,7 @@ import com.android.dx.dex.cf.*;
import com.android.dx.dex.file.DexFile;
import com.android.dx.merge.*;
import dalvik.system.*;
import org.mozilla.javascript.*;
import rhino.*;
import java.io.*;
import java.nio.*;

3
build.gradle
View File

@ -36,6 +36,7 @@ allprojects{
if(!project.hasProperty("versionType")) versionType = 'official'
appName = 'Mindustry'
steamworksVersion = '891ed912791e01fe9ee6237a6497e5212b85c256'
rhinoVersion = '66ffaf9ba089cc4e6b83cd7a9a397488cd15bf87'
loadVersionProps = {
return new Properties().with{p -> p.load(file('../core/assets/version.properties').newReader()); return p }
@ -274,7 +275,7 @@ project(":core"){
api arcModule("extensions:g3d")
api arcModule("extensions:fx")
api arcModule("extensions:arcnet")
api "org.mozilla:rhino-runtime:1.7.12"
api "com.github.Anuken:rhino:$rhinoVersion"
if(localArc() && debugged()) api arcModule("extensions:recorder")
compileOnly project(":annotations")

2
core/src/mindustry/core/Platform.java
View File

@ -14,7 +14,7 @@ import mindustry.net.*;
import mindustry.net.Net.*;
import mindustry.type.*;
import mindustry.ui.dialogs.*;
import org.mozilla.javascript.*;
import rhino.*;
import static mindustry.Vars.*;

6
core/src/mindustry/mod/Scripts.java
View File

@ -8,9 +8,9 @@ import arc.util.*;
import arc.util.Log.*;
import mindustry.*;
import mindustry.mod.Mods.*;
import org.mozilla.javascript.*;
import org.mozilla.javascript.commonjs.module.*;
import org.mozilla.javascript.commonjs.module.provider.*;
import rhino.*;
import rhino.module.*;
import rhino.module.provider.*;
import java.io.*;
import java.net.*;

2
gradle.properties
View File

@ -1,3 +1,3 @@
org.gradle.daemon=true
org.gradle.jvmargs=-Xms256m -Xmx1024m
archash=7e8a3792e5182a6ef77dd07622fcaed634b72b61
archash=99e945e135cb2209780c45c4ef19318e135b1977