diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..3543521e9 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/build diff --git a/app/build/bin/classes.dex b/app/build/bin/classes.dex index 2de58ef50..33b2127af 100644 Binary files a/app/build/bin/classes.dex and b/app/build/bin/classes.dex differ diff --git a/app/build/bin/classesdebug/com/kdt/glsupport/GLTextureView.class b/app/build/bin/classesdebug/com/kdt/glsupport/GLTextureView.class index 5d74dee16..89c0688bd 100644 Binary files a/app/build/bin/classesdebug/com/kdt/glsupport/GLTextureView.class and b/app/build/bin/classesdebug/com/kdt/glsupport/GLTextureView.class differ diff --git a/app/build/bin/classesdebug/net/kdt/pojavlaunch/MainActivity$0$debug.class b/app/build/bin/classesdebug/net/kdt/pojavlaunch/MainActivity$0$debug.class index fdd04055d..544369341 100644 Binary files a/app/build/bin/classesdebug/net/kdt/pojavlaunch/MainActivity$0$debug.class and b/app/build/bin/classesdebug/net/kdt/pojavlaunch/MainActivity$0$debug.class differ diff --git a/app/build/bin/classesdebug/net/kdt/pojavlaunch/MainActivity$100000012$0$debug.class b/app/build/bin/classesdebug/net/kdt/pojavlaunch/MainActivity$100000012$0$debug.class index 7132a8b81..b2f1d8020 100644 Binary files a/app/build/bin/classesdebug/net/kdt/pojavlaunch/MainActivity$100000012$0$debug.class and b/app/build/bin/classesdebug/net/kdt/pojavlaunch/MainActivity$100000012$0$debug.class differ diff --git a/app/build/bin/classesdebug/net/kdt/pojavlaunch/MainActivity$100000012.class b/app/build/bin/classesdebug/net/kdt/pojavlaunch/MainActivity$100000012.class index b53995984..1a63f1a43 100644 Binary files a/app/build/bin/classesdebug/net/kdt/pojavlaunch/MainActivity$100000012.class and b/app/build/bin/classesdebug/net/kdt/pojavlaunch/MainActivity$100000012.class differ diff --git a/app/build/bin/classesdebug/net/kdt/pojavlaunch/MainActivity$100000013$0$debug.class b/app/build/bin/classesdebug/net/kdt/pojavlaunch/MainActivity$100000013$0$debug.class index 895fb25be..07620b6ea 100644 Binary files a/app/build/bin/classesdebug/net/kdt/pojavlaunch/MainActivity$100000013$0$debug.class and b/app/build/bin/classesdebug/net/kdt/pojavlaunch/MainActivity$100000013$0$debug.class differ diff --git a/app/build/bin/classesdebug/net/kdt/pojavlaunch/MainActivity$100000013.class b/app/build/bin/classesdebug/net/kdt/pojavlaunch/MainActivity$100000013.class index 30a9ec640..8747bd490 100644 Binary files a/app/build/bin/classesdebug/net/kdt/pojavlaunch/MainActivity$100000013.class and b/app/build/bin/classesdebug/net/kdt/pojavlaunch/MainActivity$100000013.class differ diff --git a/app/build/bin/classesdebug/net/kdt/pojavlaunch/MainActivity$100000014$0$debug.class b/app/build/bin/classesdebug/net/kdt/pojavlaunch/MainActivity$100000014$0$debug.class index a3a8863ec..5da2a1ab4 100644 Binary files a/app/build/bin/classesdebug/net/kdt/pojavlaunch/MainActivity$100000014$0$debug.class and b/app/build/bin/classesdebug/net/kdt/pojavlaunch/MainActivity$100000014$0$debug.class differ diff --git a/app/build/bin/classesdebug/net/kdt/pojavlaunch/MainActivity$100000014.class b/app/build/bin/classesdebug/net/kdt/pojavlaunch/MainActivity$100000014.class index 1dc9f1d02..b82559605 100644 Binary files a/app/build/bin/classesdebug/net/kdt/pojavlaunch/MainActivity$100000014.class and b/app/build/bin/classesdebug/net/kdt/pojavlaunch/MainActivity$100000014.class differ diff --git a/app/build/bin/classesdebug/net/kdt/pojavlaunch/MainActivity$100000015$0$debug.class b/app/build/bin/classesdebug/net/kdt/pojavlaunch/MainActivity$100000015$0$debug.class index 6a227135e..f7eb7c982 100644 Binary files a/app/build/bin/classesdebug/net/kdt/pojavlaunch/MainActivity$100000015$0$debug.class and b/app/build/bin/classesdebug/net/kdt/pojavlaunch/MainActivity$100000015$0$debug.class differ diff --git a/app/build/bin/classesdebug/net/kdt/pojavlaunch/MainActivity$100000015.class b/app/build/bin/classesdebug/net/kdt/pojavlaunch/MainActivity$100000015.class index 5915efe7b..3be27f6e0 100644 Binary files a/app/build/bin/classesdebug/net/kdt/pojavlaunch/MainActivity$100000015.class and b/app/build/bin/classesdebug/net/kdt/pojavlaunch/MainActivity$100000015.class differ diff --git a/app/build/bin/classesdebug/net/kdt/pojavlaunch/MainActivity$SingleTapConfirm$0$debug.class b/app/build/bin/classesdebug/net/kdt/pojavlaunch/MainActivity$SingleTapConfirm$0$debug.class index c45a74fb8..dc1ab33e3 100644 Binary files a/app/build/bin/classesdebug/net/kdt/pojavlaunch/MainActivity$SingleTapConfirm$0$debug.class and b/app/build/bin/classesdebug/net/kdt/pojavlaunch/MainActivity$SingleTapConfirm$0$debug.class differ diff --git a/app/build/bin/classesdebug/net/kdt/pojavlaunch/MainActivity$SingleTapConfirm.class b/app/build/bin/classesdebug/net/kdt/pojavlaunch/MainActivity$SingleTapConfirm.class index 157bedc40..eb6d6b54d 100644 Binary files a/app/build/bin/classesdebug/net/kdt/pojavlaunch/MainActivity$SingleTapConfirm.class and b/app/build/bin/classesdebug/net/kdt/pojavlaunch/MainActivity$SingleTapConfirm.class differ diff --git a/app/build/bin/classesdebug/net/kdt/pojavlaunch/MainActivity.class b/app/build/bin/classesdebug/net/kdt/pojavlaunch/MainActivity.class index c56247aa9..6420beac8 100644 Binary files a/app/build/bin/classesdebug/net/kdt/pojavlaunch/MainActivity.class and b/app/build/bin/classesdebug/net/kdt/pojavlaunch/MainActivity.class differ diff --git a/app/build/bin/classesdebug/net/kdt/pojavlaunch/util/DownloadUtils$0$debug.class b/app/build/bin/classesdebug/net/kdt/pojavlaunch/util/DownloadUtils$0$debug.class index df967a532..35456a4c8 100644 Binary files a/app/build/bin/classesdebug/net/kdt/pojavlaunch/util/DownloadUtils$0$debug.class and b/app/build/bin/classesdebug/net/kdt/pojavlaunch/util/DownloadUtils$0$debug.class differ diff --git a/app/build/bin/classesdebug/net/kdt/pojavlaunch/util/DownloadUtils.class b/app/build/bin/classesdebug/net/kdt/pojavlaunch/util/DownloadUtils.class index f6b6e7072..3e7f6ee7e 100644 Binary files a/app/build/bin/classesdebug/net/kdt/pojavlaunch/util/DownloadUtils.class and b/app/build/bin/classesdebug/net/kdt/pojavlaunch/util/DownloadUtils.class differ diff --git a/app/build/bin/classesrelease/net/kdt/pojavlaunch/MainActivity$100000012.class b/app/build/bin/classesrelease/net/kdt/pojavlaunch/MainActivity$100000012.class index 9ef90823d..697f7a5b6 100644 Binary files a/app/build/bin/classesrelease/net/kdt/pojavlaunch/MainActivity$100000012.class and b/app/build/bin/classesrelease/net/kdt/pojavlaunch/MainActivity$100000012.class differ diff --git a/app/build/bin/classesrelease/net/kdt/pojavlaunch/MainActivity$100000012.dex b/app/build/bin/classesrelease/net/kdt/pojavlaunch/MainActivity$100000012.dex index e5a30bb70..1b2cd9663 100644 Binary files a/app/build/bin/classesrelease/net/kdt/pojavlaunch/MainActivity$100000012.dex and b/app/build/bin/classesrelease/net/kdt/pojavlaunch/MainActivity$100000012.dex differ diff --git a/app/build/bin/classesrelease/net/kdt/pojavlaunch/MainActivity$100000013.class b/app/build/bin/classesrelease/net/kdt/pojavlaunch/MainActivity$100000013.class index f6f0dc970..61727716b 100644 Binary files a/app/build/bin/classesrelease/net/kdt/pojavlaunch/MainActivity$100000013.class and b/app/build/bin/classesrelease/net/kdt/pojavlaunch/MainActivity$100000013.class differ diff --git a/app/build/bin/classesrelease/net/kdt/pojavlaunch/MainActivity$100000013.dex b/app/build/bin/classesrelease/net/kdt/pojavlaunch/MainActivity$100000013.dex index aea3ba1fd..c0f7319df 100644 Binary files a/app/build/bin/classesrelease/net/kdt/pojavlaunch/MainActivity$100000013.dex and b/app/build/bin/classesrelease/net/kdt/pojavlaunch/MainActivity$100000013.dex differ diff --git a/app/build/bin/classesrelease/net/kdt/pojavlaunch/MainActivity$100000014.class b/app/build/bin/classesrelease/net/kdt/pojavlaunch/MainActivity$100000014.class index 7ee7e6d36..0f7d2a04c 100644 Binary files a/app/build/bin/classesrelease/net/kdt/pojavlaunch/MainActivity$100000014.class and b/app/build/bin/classesrelease/net/kdt/pojavlaunch/MainActivity$100000014.class differ diff --git a/app/build/bin/classesrelease/net/kdt/pojavlaunch/MainActivity$100000014.dex b/app/build/bin/classesrelease/net/kdt/pojavlaunch/MainActivity$100000014.dex index 933815113..bdc70f31e 100644 Binary files a/app/build/bin/classesrelease/net/kdt/pojavlaunch/MainActivity$100000014.dex and b/app/build/bin/classesrelease/net/kdt/pojavlaunch/MainActivity$100000014.dex differ diff --git a/app/build/bin/classesrelease/net/kdt/pojavlaunch/MainActivity$100000015.class b/app/build/bin/classesrelease/net/kdt/pojavlaunch/MainActivity$100000015.class index caa2792d8..6b5d03832 100644 Binary files a/app/build/bin/classesrelease/net/kdt/pojavlaunch/MainActivity$100000015.class and b/app/build/bin/classesrelease/net/kdt/pojavlaunch/MainActivity$100000015.class differ diff --git a/app/build/bin/classesrelease/net/kdt/pojavlaunch/MainActivity$100000015.dex b/app/build/bin/classesrelease/net/kdt/pojavlaunch/MainActivity$100000015.dex index bacae8be9..311533ecd 100644 Binary files a/app/build/bin/classesrelease/net/kdt/pojavlaunch/MainActivity$100000015.dex and b/app/build/bin/classesrelease/net/kdt/pojavlaunch/MainActivity$100000015.dex differ diff --git a/app/build/bin/classesrelease/net/kdt/pojavlaunch/MainActivity$SingleTapConfirm.class b/app/build/bin/classesrelease/net/kdt/pojavlaunch/MainActivity$SingleTapConfirm.class index 0861b4a0e..94a0ce22e 100644 Binary files a/app/build/bin/classesrelease/net/kdt/pojavlaunch/MainActivity$SingleTapConfirm.class and b/app/build/bin/classesrelease/net/kdt/pojavlaunch/MainActivity$SingleTapConfirm.class differ diff --git a/app/build/bin/classesrelease/net/kdt/pojavlaunch/MainActivity$SingleTapConfirm.dex b/app/build/bin/classesrelease/net/kdt/pojavlaunch/MainActivity$SingleTapConfirm.dex index cc334e8d7..e38e79181 100644 Binary files a/app/build/bin/classesrelease/net/kdt/pojavlaunch/MainActivity$SingleTapConfirm.dex and b/app/build/bin/classesrelease/net/kdt/pojavlaunch/MainActivity$SingleTapConfirm.dex differ diff --git a/app/build/bin/classesrelease/net/kdt/pojavlaunch/MainActivity.class b/app/build/bin/classesrelease/net/kdt/pojavlaunch/MainActivity.class index b89d8cd77..a692c7d99 100644 Binary files a/app/build/bin/classesrelease/net/kdt/pojavlaunch/MainActivity.class and b/app/build/bin/classesrelease/net/kdt/pojavlaunch/MainActivity.class differ diff --git a/app/build/bin/classesrelease/net/kdt/pojavlaunch/MainActivity.dex b/app/build/bin/classesrelease/net/kdt/pojavlaunch/MainActivity.dex index 35d06e7ac..98fc55651 100644 Binary files a/app/build/bin/classesrelease/net/kdt/pojavlaunch/MainActivity.dex and b/app/build/bin/classesrelease/net/kdt/pojavlaunch/MainActivity.dex differ diff --git a/app/build/bin/classesrelease/net/kdt/pojavlaunch/util/DownloadUtils.class b/app/build/bin/classesrelease/net/kdt/pojavlaunch/util/DownloadUtils.class index ed777f3a9..be8e52410 100644 Binary files a/app/build/bin/classesrelease/net/kdt/pojavlaunch/util/DownloadUtils.class and b/app/build/bin/classesrelease/net/kdt/pojavlaunch/util/DownloadUtils.class differ diff --git a/app/build/bin/classesrelease/net/kdt/pojavlaunch/util/DownloadUtils.dex b/app/build/bin/classesrelease/net/kdt/pojavlaunch/util/DownloadUtils.dex index 89b31bfd5..dd227a0db 100644 Binary files a/app/build/bin/classesrelease/net/kdt/pojavlaunch/util/DownloadUtils.dex and b/app/build/bin/classesrelease/net/kdt/pojavlaunch/util/DownloadUtils.dex differ diff --git a/app/src/main/java/net/kdt/pojavlaunch/MainActivity.java b/app/src/main/java/net/kdt/pojavlaunch/MainActivity.java index ee5ca0514..afd68be8f 100644 --- a/app/src/main/java/net/kdt/pojavlaunch/MainActivity.java +++ b/app/src/main/java/net/kdt/pojavlaunch/MainActivity.java @@ -735,47 +735,32 @@ public class MainActivity extends Activity implements OnTouchListener appendToLog(text + "\n"); } - private boolean isLogAllowed = false; - private boolean isFirstLog = true; private void appendToLog(final String text) { - new Thread(new Runnable(){ - - @Override - public void run() - { - while (!isLogAllowed) { - try { - if (isFirstLog) { - isFirstLog = false; - Thread.sleep(5000); - isLogAllowed = true; - } - - Thread.sleep(100); - } catch (InterruptedException e) {} + // test skip + if (true) return; + + + + + textLog.post(new Runnable(){ + private String allText; + @Override + public void run() + { + textLog.append(text); + if (toggleScrollLog.isChecked()) { + contentScroll.fullScroll(ScrollView.FOCUS_DOWN); + } } - - textLog.post(new Runnable(){ - private String allText; - @Override - public void run() - { - textLog.append(text); - if (toggleScrollLog.isChecked()) { - contentScroll.fullScroll(ScrollView.FOCUS_DOWN); - } - } - }); - textLogBehindGL.post(new Runnable(){ + }); + textLogBehindGL.post(new Runnable(){ - @Override - public void run() - { - textLogBehindGL.append(text); - } - }); - } - }, "PojavLoggerThread").start(); + @Override + public void run() + { + textLogBehindGL.append(text); + } + }); } public void handleMessage(Message msg) { diff --git a/app/src/main/java/net/kdt/pojavlaunch/Tools.java b/app/src/main/java/net/kdt/pojavlaunch/Tools.java index 1c758013d..5a603b478 100644 --- a/app/src/main/java/net/kdt/pojavlaunch/Tools.java +++ b/app/src/main/java/net/kdt/pojavlaunch/Tools.java @@ -292,7 +292,7 @@ public final class Tools mainLoader.loadClass("com.android.dx.observer.ObserverStatus").getMethod("setReceiver", String.class).invoke(null, receiveMethod); Class mainClass = mainLoader.loadClass("com.android.dx.command.Main"); Method mainMethod = mainClass.getMethod("main", new String[]{}.getClass()); - mainMethod.invoke(null, new Object[]{new String[]{"--dex", "--output", newFileOut.getAbsolutePath(), fileIn}}); + mainMethod.invoke(null, new Object[]{new String[]{"--dex", "--no-optimize", "--min-sdk-version=" + Build.VERSION.SDK_INT, "--output", newFileOut.getAbsolutePath(), fileIn}}); //com.android.dx.mod.Main.dexTheJar(fileIn, fileOut, ctx.getCacheDir().getAbsolutePath(), listener); diff --git a/app/src/main/java/net/kdt/pojavlaunch/util/DownloadUtils.java b/app/src/main/java/net/kdt/pojavlaunch/util/DownloadUtils.java index 84012d07e..37f2e9041 100644 --- a/app/src/main/java/net/kdt/pojavlaunch/util/DownloadUtils.java +++ b/app/src/main/java/net/kdt/pojavlaunch/util/DownloadUtils.java @@ -22,9 +22,10 @@ public class DownloadUtils { InputStream is = null; byte[] buf; // 16384 try { + // System.out.println("Connecting: " + url.toString()); HttpURLConnection conn = (HttpURLConnection) url.openConnection(); conn.setRequestProperty("User-Agent", USER_AGENT); - conn.setConnectTimeout(2000); + conn.setConnectTimeout(10000); conn.setDoInput(true); conn.connect(); if (conn.getResponseCode() != HttpURLConnection.HTTP_OK) {