Skip to content

Commit ee3435d

Browse files
artdeellartdeell
committed
Feat[launcher]: add support for the "Better than Adventure!" mod
1 parent 3d256a2 commit ee3435d

File tree

9 files changed

+379
-1
lines changed

9 files changed

+379
-1
lines changed

‎app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/Tools.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,7 @@ public static void launchMinecraft(final AppCompatActivity activity, MinecraftAc
327327
}
328328
javaArgList.addAll(Arrays.asList(getMinecraftJVMArgs(versionId, gamedir)));
329329
javaArgList.add("-cp");
330-
javaArgList.add(getLWJGL3ClassPath() + ":" + launchClassPath);
330+
javaArgList.add(launchClassPath + ":" + getLWJGL3ClassPath());
331331

332332
javaArgList.add(versionInfo.mainClass);
333333
javaArgList.addAll(Arrays.asList(launchArgs));

‎app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/fragments/BTAInstallFragment.java

+57
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
package net.kdt.pojavlaunch.fragments;
2+
3+
import android.content.Context;
4+
import android.view.LayoutInflater;
5+
import android.widget.ExpandableListAdapter;
6+
7+
import net.kdt.pojavlaunch.R;
8+
import net.kdt.pojavlaunch.modloaders.BTADownloadTask;
9+
import net.kdt.pojavlaunch.modloaders.BTAUtils;
10+
import net.kdt.pojavlaunch.modloaders.BTAVersionListAdapter;
11+
import net.kdt.pojavlaunch.modloaders.ModloaderListenerProxy;
12+
13+
import java.io.File;
14+
import java.io.IOException;
15+
16+
public class BTAInstallFragment extends ModVersionListFragment<BTAUtils.BTAVersionList> {
17+
private static ModloaderListenerProxy sTaskProxy;
18+
@Override
19+
public int getTitleText() {
20+
return R.string.select_bta_version;
21+
}
22+
23+
@Override
24+
public int getNoDataMsg() {
25+
return R.string.modloader_dl_failed_to_load_list;
26+
}
27+
28+
@Override
29+
public ModloaderListenerProxy getTaskProxy() {
30+
return sTaskProxy;
31+
}
32+
33+
@Override
34+
public BTAUtils.BTAVersionList loadVersionList() throws IOException {
35+
return BTAUtils.downloadVersionList();
36+
}
37+
38+
@Override
39+
public void setTaskProxy(ModloaderListenerProxy proxy) {
40+
sTaskProxy = proxy;
41+
}
42+
43+
@Override
44+
public ExpandableListAdapter createAdapter(BTAUtils.BTAVersionList versionList, LayoutInflater layoutInflater) {
45+
return new BTAVersionListAdapter(versionList, layoutInflater);
46+
}
47+
48+
@Override
49+
public Runnable createDownloadTask(Object selectedVersion, ModloaderListenerProxy listenerProxy) {
50+
return new BTADownloadTask(listenerProxy, (BTAUtils.BTAVersion) selectedVersion);
51+
}
52+
53+
@Override
54+
public void onDownloadFinished(Context context, File downloadedFile) {
55+
// We don't have to do anything after the BTADownloadTask ends, so this is a stub
56+
}
57+
}

‎app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/fragments/ProfileTypeSelectFragment.java

+2
Original file line numberDiff line numberDiff line change
@@ -35,5 +35,7 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
3535
Tools.swapFragment(requireActivity(), SearchModFragment.class, SearchModFragment.TAG, null));
3636
view.findViewById(R.id.modded_profile_quilt).setOnClickListener((v)->
3737
Tools.swapFragment(requireActivity(), QuiltInstallFragment.class, QuiltInstallFragment.TAG, null));
38+
view.findViewById(R.id.modded_profile_bta).setOnClickListener((v)->
39+
Tools.swapFragment(requireActivity(), BTAInstallFragment.class, BTAInstallFragment.TAG, null));
3840
}
3941
}

‎app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/BTADownloadTask.java

+97
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,97 @@
1+
package net.kdt.pojavlaunch.modloaders;
2+
3+
import android.util.Base64;
4+
import android.util.Base64OutputStream;
5+
import android.util.Log;
6+
7+
import com.kdt.mcgui.ProgressLayout;
8+
9+
import net.kdt.pojavlaunch.R;
10+
import net.kdt.pojavlaunch.Tools;
11+
import net.kdt.pojavlaunch.progresskeeper.ProgressKeeper;
12+
import net.kdt.pojavlaunch.utils.DownloadUtils;
13+
import net.kdt.pojavlaunch.utils.FileUtils;
14+
import net.kdt.pojavlaunch.value.launcherprofiles.LauncherProfiles;
15+
import net.kdt.pojavlaunch.value.launcherprofiles.MinecraftProfile;
16+
17+
import java.io.ByteArrayOutputStream;
18+
import java.io.File;
19+
import java.io.IOException;
20+
import java.nio.charset.StandardCharsets;
21+
22+
public class BTADownloadTask implements Runnable {
23+
private static final String BASE_JSON = "{\"inheritsFrom\":\"b1.7.3\",\"mainClass\":\"net.minecraft.client.Minecraft\",\"libraries\":[{\"name\":\"bta-client:bta-client:%1$s\",\"downloads\":{\"artifact\":{\"path\":\"bta-client/bta-client-%1$s.jar\",\"url\":\"%2$s\"}}}],\"id\":\"%3$s\"}";
24+
private final ModloaderDownloadListener mListener;
25+
private final BTAUtils.BTAVersion mBtaVersion;
26+
27+
public BTADownloadTask(ModloaderDownloadListener mListener, BTAUtils.BTAVersion mBtaVersion) {
28+
this.mListener = mListener;
29+
this.mBtaVersion = mBtaVersion;
30+
}
31+
32+
@Override
33+
public void run() {
34+
ProgressKeeper.submitProgress(ProgressLayout.INSTALL_MODPACK, 0, R.string.fabric_dl_progress, "BTA");
35+
try {
36+
runCatching() ;
37+
mListener.onDownloadFinished(null);
38+
}catch (IOException e) {
39+
mListener.onDownloadError(e);
40+
}
41+
ProgressLayout.clearProgress(ProgressLayout.INSTALL_MODPACK);
42+
}
43+
44+
private String tryDownloadIcon() {
45+
ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
46+
try (Base64OutputStream base64OutputStream = new Base64OutputStream(byteArrayOutputStream, Base64.DEFAULT)){
47+
// Instead of appending and wasting memory with a StringBuilder, just write the prefix
48+
// to the stream before the base64 icon data.
49+
byteArrayOutputStream.write("data:image/png;base64,".getBytes(StandardCharsets.US_ASCII));
50+
DownloadUtils.download(mBtaVersion.iconUrl, base64OutputStream);
51+
return new String(byteArrayOutputStream.toByteArray(), StandardCharsets.US_ASCII);
52+
}catch (IOException e) {
53+
Log.w("BTADownloadTask", "Failed to download base64 icon", e);
54+
}finally {
55+
try {
56+
byteArrayOutputStream.close();
57+
} catch (IOException e) {
58+
Log.wtf("BTADownloadTask", "Failed to close a byte array stream??", e);
59+
}
60+
}
61+
return null;
62+
}
63+
64+
private void createJson(String btaVersionId) throws IOException {
65+
String btaJson = String.format(BASE_JSON, mBtaVersion.versionName, mBtaVersion.downloadUrl, btaVersionId);
66+
File jsonDir = new File(Tools.DIR_HOME_VERSION, btaVersionId);
67+
File jsonFile = new File(jsonDir, btaVersionId+".json");
68+
FileUtils.ensureDirectory(jsonDir);
69+
Tools.write(jsonFile.getAbsolutePath(), btaJson);
70+
}
71+
72+
// BTA doesn't have SHA1 checksums in its repositories, so the user may try to reinstall it
73+
// if it didn't work due to a broken download. So, for reinstalls like that to work,
74+
// we need to delete the old client jar to force the download of a new one.
75+
private void removeOldClient() throws IOException{
76+
File btaClientPath = new File(Tools.DIR_HOME_LIBRARY, String.format("bta-client/bta-client-%1$s.jar", mBtaVersion.versionName));
77+
if(btaClientPath.exists() && !btaClientPath.delete())
78+
throw new IOException("Failed to delete old client jar");
79+
}
80+
81+
private void createProfile(String btaVersionId) throws IOException {
82+
LauncherProfiles.load();
83+
MinecraftProfile btaProfile = new MinecraftProfile();
84+
btaProfile.lastVersionId = btaVersionId;
85+
btaProfile.name = "Better than Adventure!";
86+
btaProfile.icon = tryDownloadIcon();
87+
LauncherProfiles.insertMinecraftProfile(btaProfile);
88+
LauncherProfiles.write();
89+
}
90+
91+
public void runCatching() throws IOException {
92+
removeOldClient();
93+
String btaVersionId = "bta-"+mBtaVersion.versionName;
94+
createJson(btaVersionId);
95+
createProfile(btaVersionId);
96+
}
97+
}

‎app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/BTAUtils.java

+109
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,109 @@
1+
package net.kdt.pojavlaunch.modloaders;
2+
3+
import android.util.Log;
4+
5+
import androidx.annotation.Keep;
6+
7+
import com.google.gson.JsonParseException;
8+
import com.google.gson.annotations.SerializedName;
9+
10+
import net.kdt.pojavlaunch.Tools;
11+
import net.kdt.pojavlaunch.utils.DownloadUtils;
12+
13+
import java.io.IOException;
14+
import java.util.ArrayList;
15+
import java.util.List;
16+
import java.util.ListIterator;
17+
18+
public class BTAUtils {
19+
private static final String BTA_CLIENT_URL = "https://downloads.betterthanadventure.net/bta-client/release/%s/client.jar";
20+
private static final String BTA_ICON_URL = "https://downloads.betterthanadventure.net/bta-client/release/%s/auto/%s.png";
21+
private static final List<String> BTA_TESTED_VERSIONS = new ArrayList<>();
22+
static {
23+
BTA_TESTED_VERSIONS.add("v7.3");
24+
BTA_TESTED_VERSIONS.add("v7.2_01");
25+
BTA_TESTED_VERSIONS.add("v7.2");
26+
BTA_TESTED_VERSIONS.add("v7.1_01");
27+
BTA_TESTED_VERSIONS.add("v7.1");
28+
}
29+
30+
private static String getIconUrl(String version) {
31+
String versionUnderscore = version.replace('.','_');
32+
return String.format(BTA_ICON_URL, version, versionUnderscore);
33+
}
34+
35+
private static List<BTAVersion> createVersionList(List<String> versionStrings) {
36+
ListIterator<String> iterator = versionStrings.listIterator(versionStrings.size());
37+
ArrayList<BTAVersion> btaVersions = new ArrayList<>(versionStrings.size());
38+
while(iterator.hasPrevious()) {
39+
String version = iterator.previous();
40+
btaVersions.add(new BTAVersion(
41+
version,
42+
String.format(BTA_CLIENT_URL, version),
43+
getIconUrl(version)
44+
));
45+
}
46+
btaVersions.trimToSize();
47+
return btaVersions;
48+
}
49+
50+
private static BTAVersionList processReleasesJson(String releasesInfo) throws JsonParseException {
51+
BTAVersionsManifest manifest = Tools.GLOBAL_GSON.fromJson(releasesInfo, BTAVersionsManifest.class);
52+
List<String> stringVersions = manifest.versions;
53+
List<String> testedVersions = new ArrayList<>();
54+
List<String> untestedVersions = new ArrayList<>();
55+
for(String version : stringVersions) {
56+
if(version == null) break;
57+
if(BTA_TESTED_VERSIONS.contains(version)) {
58+
testedVersions.add(version);
59+
}else {
60+
untestedVersions.add(version);
61+
}
62+
}
63+
64+
return new BTAVersionList(
65+
createVersionList(testedVersions),
66+
createVersionList(untestedVersions)
67+
);
68+
}
69+
70+
public static BTAVersionList downloadVersionList() throws IOException {
71+
try {
72+
return DownloadUtils.downloadStringCached(
73+
"https://downloads.betterthanadventure.net/bta-client/release/versions.json",
74+
"bta_releases", BTAUtils::processReleasesJson);
75+
}catch (DownloadUtils.ParseException e) {
76+
Log.e("BTAUtils", "Failed to process json", e);
77+
return null;
78+
}
79+
}
80+
81+
private static class BTAVersionsManifest {
82+
@Keep
83+
public List<String> versions;
84+
@Keep
85+
@SerializedName("default")
86+
public String defaultVersion;
87+
}
88+
89+
public static class BTAVersion {
90+
public final String versionName;
91+
public final String downloadUrl;
92+
public final String iconUrl;
93+
94+
public BTAVersion(String versionName, String downloadUrl, String iconUrl) {
95+
this.versionName = versionName;
96+
this.downloadUrl = downloadUrl;
97+
this.iconUrl = iconUrl;
98+
}
99+
}
100+
public static class BTAVersionList {
101+
public final List<BTAVersion> testedVersions;
102+
public final List<BTAVersion> untestedVersions;
103+
104+
public BTAVersionList(List<BTAVersion> mTestedVersions, List<BTAVersion> mUntestedVersions) {
105+
this.testedVersions = mTestedVersions;
106+
this.untestedVersions = mUntestedVersions;
107+
}
108+
}
109+
}

‎app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/BTAVersionListAdapter.java

+95
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,95 @@
1+
package net.kdt.pojavlaunch.modloaders;
2+
3+
import android.content.Context;
4+
import android.view.LayoutInflater;
5+
import android.view.View;
6+
import android.view.ViewGroup;
7+
import android.widget.BaseExpandableListAdapter;
8+
import android.widget.ExpandableListAdapter;
9+
import android.widget.TextView;
10+
11+
import net.kdt.pojavlaunch.R;
12+
13+
import java.util.ArrayList;
14+
import java.util.List;
15+
16+
public class BTAVersionListAdapter extends BaseExpandableListAdapter implements ExpandableListAdapter{
17+
private final LayoutInflater mLayoutInflater;
18+
private final ArrayList<String> mGroupNames;
19+
private final ArrayList<List<BTAUtils.BTAVersion>> mGroups;
20+
21+
public BTAVersionListAdapter(BTAUtils.BTAVersionList versionList, LayoutInflater mLayoutInflater) {
22+
this.mLayoutInflater = mLayoutInflater;
23+
Context context = mLayoutInflater.getContext();
24+
mGroupNames = new ArrayList<>(2);
25+
mGroups = new ArrayList<>(2);
26+
if(!versionList.testedVersions.isEmpty()) {
27+
mGroupNames.add(context.getString(R.string.bta_installer_available_versions));
28+
mGroups.add(versionList.testedVersions);
29+
}
30+
if(!versionList.untestedVersions.isEmpty()) {
31+
mGroupNames.add(context.getString(R.string.bta_installer_untested_versions));
32+
mGroups.add(versionList.untestedVersions);
33+
}
34+
mGroupNames.trimToSize();
35+
mGroups.trimToSize();
36+
}
37+
38+
@Override
39+
public int getGroupCount() {
40+
return mGroups.size();
41+
}
42+
43+
@Override
44+
public int getChildrenCount(int i) {
45+
return mGroups.get(i).size();
46+
}
47+
48+
@Override
49+
public Object getGroup(int i) {
50+
return mGroupNames.get(i);
51+
}
52+
53+
@Override
54+
public Object getChild(int i, int i1) {
55+
return mGroups.get(i).get(i1);
56+
}
57+
58+
@Override
59+
public long getGroupId(int i) {
60+
return i;
61+
}
62+
63+
@Override
64+
public long getChildId(int i, int i1) {
65+
return i1;
66+
}
67+
68+
@Override
69+
public boolean hasStableIds() {
70+
return true;
71+
}
72+
73+
@Override
74+
public View getGroupView(int i, boolean b, View convertView, ViewGroup viewGroup) {
75+
if(convertView == null)
76+
convertView = mLayoutInflater.inflate(android.R.layout.simple_expandable_list_item_1, viewGroup, false);
77+
78+
((TextView) convertView).setText((String)getGroup(i));
79+
80+
return convertView;
81+
}
82+
83+
@Override
84+
public View getChildView(int i, int i1, boolean b, View convertView, ViewGroup viewGroup) {
85+
if(convertView == null)
86+
convertView = mLayoutInflater.inflate(android.R.layout.simple_expandable_list_item_1, viewGroup, false);
87+
((TextView) convertView).setText(((BTAUtils.BTAVersion)getChild(i,i1)).versionName);
88+
return convertView;
89+
}
90+
91+
@Override
92+
public boolean isChildSelectable(int i, int i1) {
93+
return true;
94+
}
95+
}

‎app_pojavlauncher/src/main/res/layout/fragment_profile_type.xml

+8
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,14 @@
111111
android:layout_marginTop="@dimen/padding_large"
112112
android:text="@string/modpack_install_button" />
113113

114+
<com.kdt.mcgui.MineButton
115+
android:id="@+id/modded_profile_bta"
116+
android:layout_width="match_parent"
117+
android:layout_height="wrap_content"
118+
android:layout_marginHorizontal="@dimen/padding_large"
119+
android:layout_marginTop="@dimen/padding_large"
120+
android:text="@string/create_bta_profile" />
121+
114122
<androidx.constraintlayout.widget.Guideline
115123
android:id="@+id/guideline"
116124
android:layout_width="wrap_content"

0 commit comments

Comments
 (0)