From acd5b8a39342bd3304e6e673634b097d9d9d1812 Mon Sep 17 00:00:00 2001 From: khanhduytran0 Date: Sat, 5 Dec 2020 17:15:14 +0700 Subject: [PATCH] Changes - Automatic disable Forge splash screen. - Change package of some components. --- .../java/com/kdt/glsupport/GLTextureView.java | 5 +---- .../{filerapi => pickafile}/FileListView.java | 2 +- .../FileSelectedListener.java | 2 +- .../{filerapi => pickafile}/SortFileName.java | 2 +- .../kdt/pojavlaunch/BaseLauncherActivity.java | 2 +- .../kdt/pojavlaunch/CustomControlsActivity.java | 2 +- .../net/kdt/pojavlaunch/MCLauncherActivity.java | 2 +- .../kdt/pojavlaunch/PojavLauncherActivity.java | 2 +- .../net/kdt/pojavlaunch/PojavLoginActivity.java | 17 ++++++++++++++++- 9 files changed, 24 insertions(+), 12 deletions(-) rename app/src/main/java/com/kdt/{filerapi => pickafile}/FileListView.java (99%) rename app/src/main/java/com/kdt/{filerapi => pickafile}/FileSelectedListener.java (87%) rename app/src/main/java/com/kdt/{filerapi => pickafile}/SortFileName.java (89%) diff --git a/app/src/main/java/com/kdt/glsupport/GLTextureView.java b/app/src/main/java/com/kdt/glsupport/GLTextureView.java index 230afcb52..d2c6ea4ba 100644 --- a/app/src/main/java/com/kdt/glsupport/GLTextureView.java +++ b/app/src/main/java/com/kdt/glsupport/GLTextureView.java @@ -1,7 +1,5 @@ package com.kdt.glsupport; -// Search "DISABLED" to find disabled codes. - import java.io.Writer; import java.lang.ref.WeakReference; import java.util.ArrayList; @@ -1257,7 +1255,6 @@ public class GLTextureView Log.i("GLThread", "noticed surfaceView surface lost tid=" + getId()); } if (mHaveEglSurface) { - // DISABLED stopEglSurfaceLocked(); } mWaitingForSurface = true; @@ -1505,7 +1502,7 @@ public class GLTextureView synchronized(sGLThreadManager) { if (LOG_THREADS) { Log.i("GLThread", "surfaceDestroyed tid=" + getId()); - new Throwable("Surface destroy calling at???").printStackTrace(); + // new Throwable("Surface destroy calling at???").printStackTrace(); } mHasSurface = false; sGLThreadManager.notifyAll(); diff --git a/app/src/main/java/com/kdt/filerapi/FileListView.java b/app/src/main/java/com/kdt/pickafile/FileListView.java similarity index 99% rename from app/src/main/java/com/kdt/filerapi/FileListView.java rename to app/src/main/java/com/kdt/pickafile/FileListView.java index 6c01ba358..cf19eed3b 100644 --- a/app/src/main/java/com/kdt/filerapi/FileListView.java +++ b/app/src/main/java/com/kdt/pickafile/FileListView.java @@ -1,4 +1,4 @@ -package com.kdt.filerapi; +package com.kdt.pickafile; import android.support.v7.app.*; import android.content.*; diff --git a/app/src/main/java/com/kdt/filerapi/FileSelectedListener.java b/app/src/main/java/com/kdt/pickafile/FileSelectedListener.java similarity index 87% rename from app/src/main/java/com/kdt/filerapi/FileSelectedListener.java rename to app/src/main/java/com/kdt/pickafile/FileSelectedListener.java index 476f4cfaf..2b1413d8c 100644 --- a/app/src/main/java/com/kdt/filerapi/FileSelectedListener.java +++ b/app/src/main/java/com/kdt/pickafile/FileSelectedListener.java @@ -1,4 +1,4 @@ -package com.kdt.filerapi; +package com.kdt.pickafile; import java.io.File; diff --git a/app/src/main/java/com/kdt/filerapi/SortFileName.java b/app/src/main/java/com/kdt/pickafile/SortFileName.java similarity index 89% rename from app/src/main/java/com/kdt/filerapi/SortFileName.java rename to app/src/main/java/com/kdt/pickafile/SortFileName.java index 5b4f692c6..7f9be2639 100644 --- a/app/src/main/java/com/kdt/filerapi/SortFileName.java +++ b/app/src/main/java/com/kdt/pickafile/SortFileName.java @@ -1,4 +1,4 @@ -package com.kdt.filerapi; +package com.kdt.pickafile; import java.io.*; import java.util.*; diff --git a/app/src/main/java/net/kdt/pojavlaunch/BaseLauncherActivity.java b/app/src/main/java/net/kdt/pojavlaunch/BaseLauncherActivity.java index 049354e17..1626c53dd 100644 --- a/app/src/main/java/net/kdt/pojavlaunch/BaseLauncherActivity.java +++ b/app/src/main/java/net/kdt/pojavlaunch/BaseLauncherActivity.java @@ -6,7 +6,7 @@ import android.support.v7.app.*; import android.text.*; import android.view.*; import android.widget.*; -import com.kdt.filerapi.*; +import com.kdt.pickafile.*; import java.io.*; import net.kdt.pojavlaunch.fragments.*; import net.kdt.pojavlaunch.prefs.*; diff --git a/app/src/main/java/net/kdt/pojavlaunch/CustomControlsActivity.java b/app/src/main/java/net/kdt/pojavlaunch/CustomControlsActivity.java index c1adb418b..05bbcfaaf 100644 --- a/app/src/main/java/net/kdt/pojavlaunch/CustomControlsActivity.java +++ b/app/src/main/java/net/kdt/pojavlaunch/CustomControlsActivity.java @@ -9,7 +9,7 @@ import android.support.v7.preference.*; import android.view.*; import android.widget.*; import com.google.gson.*; -import com.kdt.filerapi.*; +import com.kdt.pickafile.*; import java.io.*; import net.kdt.pojavlaunch.*; import net.kdt.pojavlaunch.prefs.*; diff --git a/app/src/main/java/net/kdt/pojavlaunch/MCLauncherActivity.java b/app/src/main/java/net/kdt/pojavlaunch/MCLauncherActivity.java index fd0620bc0..cebcf0736 100644 --- a/app/src/main/java/net/kdt/pojavlaunch/MCLauncherActivity.java +++ b/app/src/main/java/net/kdt/pojavlaunch/MCLauncherActivity.java @@ -13,7 +13,7 @@ import android.view.*; import android.widget.*; import android.widget.AdapterView.*; import com.google.gson.*; -import com.kdt.filerapi.*; +import com.kdt.pickafile.*; import java.io.*; import java.nio.charset.*; import java.util.*; diff --git a/app/src/main/java/net/kdt/pojavlaunch/PojavLauncherActivity.java b/app/src/main/java/net/kdt/pojavlaunch/PojavLauncherActivity.java index eb60752ad..483e5d1bf 100644 --- a/app/src/main/java/net/kdt/pojavlaunch/PojavLauncherActivity.java +++ b/app/src/main/java/net/kdt/pojavlaunch/PojavLauncherActivity.java @@ -14,7 +14,7 @@ import android.view.*; import android.widget.*; import android.widget.AdapterView.*; import com.google.gson.*; -import com.kdt.filerapi.*; +import com.kdt.pickafile.*; import java.io.*; import java.nio.charset.*; import java.util.*; diff --git a/app/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java b/app/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java index a466b4363..bd3c77e1e 100644 --- a/app/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java +++ b/app/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java @@ -16,7 +16,7 @@ import android.util.Log; import android.view.*; import android.widget.*; import android.widget.CompoundButton.*; -import com.kdt.filerapi.*; +import com.kdt.pickafile.*; import com.kdt.mojangauth.*; import java.io.*; import java.util.*; @@ -333,6 +333,21 @@ public class PojavLoginActivity extends BaseActivity mkdirs(Tools.MAIN_PATH + "/lwjgl3"); mkdirs(Tools.MAIN_PATH + "/mods"); + File forgeSplashFile = new File(Tools.MAIN_PATH, "config/splash.properties"); + forgeSplashFile.mkdir(); + String forgeSplashContent = "enabled=true"; + try { + if (forgeSplashFile.exists()) { + forgeSplashContent = Tools.read(forgeSplashFile.toString()); + } + if (forgeSplashContent.contains("enabled=true")) { + Tools.write(forgeSplashFile.toString(), + forgeSplashContent.replace("enabled=true", "enabled=false")); + } + } catch (IOException e) { + Log.w(Tools.APP_NAME, "Could not disable Forge splash screen!"); + } + mkdirs(Tools.CTRLMAP_PATH); try {