From 1e8a51fd72ce9327c31cea753664f97de33c7b8e Mon Sep 17 00:00:00 2001
From: khanhduytran0 <khanhduytran032@gmail.com>
Date: Wed, 18 Nov 2020 19:17:03 +0700
Subject: [PATCH] Changes - Bug fix: architecture x86 (i*86) is always
 incompatible. - Add some language list updater script

---
 .../main/java/net/kdt/pojavlaunch/BaseMainActivity.java   | 2 +-
 scripts/languagelist_updater.bat                          | 8 ++++++++
 scripts/languagelist_updater.sh                           | 8 ++++++++
 3 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 scripts/languagelist_updater.bat
 create mode 100644 scripts/languagelist_updater.sh

diff --git a/app/src/main/java/net/kdt/pojavlaunch/BaseMainActivity.java b/app/src/main/java/net/kdt/pojavlaunch/BaseMainActivity.java
index 968ed332f..e72c831f3 100644
--- a/app/src/main/java/net/kdt/pojavlaunch/BaseMainActivity.java
+++ b/app/src/main/java/net/kdt/pojavlaunch/BaseMainActivity.java
@@ -934,7 +934,7 @@ public class BaseMainActivity extends LoggableActivity implements OnTouchListene
     private void checkJavaArchitecture(String jreArch) throws Exception {
         String[] argName = Tools.currentArch.split("/");
         appendlnToLog("Architecture: " + Tools.currentArch);
-        if (!(jreArch.contains(argName[0]) || jreArch.contains(argName[1]))) {
+        if (!(jreArch.contains(argName[0]) || jreArch.contains(argName[1])) && !(jreArch.startsWith("i") && jreArch.endsWith("86") && argName[1].equals("x86"))) {
             appendlnToLog("Architecture " + Tools.currentArch + " is incompatible with Java Runtime " + jreArch);
             throw new RuntimeException(getString(R.string.mcn_check_fail_incompatiblearch, Tools.currentArch, jreArch));
         }
diff --git a/scripts/languagelist_updater.bat b/scripts/languagelist_updater.bat
new file mode 100644
index 000000000..a91993df1
--- /dev/null
+++ b/scripts/languagelist_updater.bat
@@ -0,0 +1,8 @@
+#!/bin/bash
+# TODO
+THISDIR = `dirname $0`
+LANGFILE = $THISDIR/../app/src/main/assets/language_list.txt
+
+rm $LANGFILE
+ls $THISDIR/../app/src/main/res/values-* >> $LANGFILE
+
diff --git a/scripts/languagelist_updater.sh b/scripts/languagelist_updater.sh
new file mode 100644
index 000000000..decd05e20
--- /dev/null
+++ b/scripts/languagelist_updater.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+THISDIR = `dirname $0`
+LANGFILE = $THISDIR/../app/src/main/assets/language_list.txt
+
+rm $LANGFILE
+ls $THISDIR/../app/src/main/res/values-* >> $LANGFILE
+