Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 31 additions & 31 deletions app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/Tools.java
Original file line number Diff line number Diff line change
Expand Up @@ -696,6 +696,8 @@ public static void getCacioJavaArgs(List<String> javaArgList, boolean isJava8, A

public static String[] getMinecraftJVMArgs(String versionName, File gameDir) {
JMinecraftVersionList.Version versionInfo = Tools.getVersionInfo(versionName, true);
if (versionInfo.arguments == null || versionInfo.arguments.jvm == null)
return new String[0];

Map<String, String> varArgMap = new ArrayMap<>();
varArgMap.put("classpath_separator", ":");
Expand All @@ -704,39 +706,37 @@ public static String[] getMinecraftJVMArgs(String versionName, File gameDir) {
varArgMap.put("natives_directory", Tools.DIR_CACHE.getAbsolutePath());

List<String> minecraftArgs = new ArrayList<>();
if (versionInfo.arguments.jvm != null) {
for (Object arg : versionInfo.arguments.jvm) {
if (arg instanceof String) {
// These are defined later on
if (((String) arg).contains("java.library.path")) {
continue;
}
if (arg.equals("-cp")) {
continue;
}
if (arg.equals("${classpath}")){
continue;
}
// Should fix Forge 1.17.1-37.0.12 and older from crashing
// Fixed in forge on https://github.com/MinecraftForge/MinecraftForge/pull/7919
// Released as Forge 1.17.1-37.0.13 in https://maven.minecraftforge.net/net/minecraftforge/forge/1.17.1-37.0.13/forge-1.17.1-37.0.13-changelog.txt
// yes this duplicates it, it's fine.
// FIXME: Workaround old bootstraplauncher <0.1.17 buggy behaviour. See FCL workaround
// https://github.com/FCL-Team/FoldCraftLauncher/blob/00e96bcf8ddc8a550e9aba6091a73d5bee973b54/FCLCore/src/main/java/com/tungsten/fclcore/download/MaintainTask.java#L198-L200
if (((String) arg).startsWith("-DignoreList=")){
minecraftArgs.add(arg+",${version_name}.jar");
continue;
}
for (Object arg : versionInfo.arguments.jvm) {
if (arg instanceof String) {
// These are defined later on
if (((String) arg).contains("java.library.path")) {
continue;
}
if (arg.equals("-cp")) {
continue;
}
if (arg.equals("${classpath}")){
continue;
}
// Should fix Forge 1.17.1-37.0.12 and older from crashing
// Fixed in forge on https://github.com/MinecraftForge/MinecraftForge/pull/7919
// Released as Forge 1.17.1-37.0.13 in https://maven.minecraftforge.net/net/minecraftforge/forge/1.17.1-37.0.13/forge-1.17.1-37.0.13-changelog.txt
// yes this duplicates it, it's fine.
// FIXME: Workaround old bootstraplauncher <0.1.17 buggy behaviour. See FCL workaround
// https://github.com/FCL-Team/FoldCraftLauncher/blob/00e96bcf8ddc8a550e9aba6091a73d5bee973b54/FCLCore/src/main/java/com/tungsten/fclcore/download/MaintainTask.java#L198-L200
if (((String) arg).startsWith("-DignoreList=")){
minecraftArgs.add(arg+",${version_name}.jar");
continue;
}

// TODO: Implement adding launcher brand and version
if (((String) arg).contains("minecraft.launcher.brand") ||
((String) arg).contains("minecraft.launcher.version")) {
continue;
}
// TODO: Implement adding launcher brand and version
if (((String) arg).contains("minecraft.launcher.brand") ||
((String) arg).contains("minecraft.launcher.version")) {
continue;
}

minecraftArgs.add((String) arg);
} //TODO: implement (?maybe?)
}
minecraftArgs.add((String) arg);
} //TODO: implement (?maybe?)
}
return JSONUtils.insertJSONValueList(minecraftArgs.toArray(new String[0]), varArgMap);
}
Expand Down
34 changes: 4 additions & 30 deletions app_pojavlauncher/src/main/res/drawable/ic_folder_managed.xml
Original file line number Diff line number Diff line change
@@ -1,31 +1,5 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">

<!-- ic_folder -->
<path
android:fillColor="#FFFFFF"
android:pathData="M4,4h8v2h10v14L2,20L2,4zM20,8L10,8L10,6L4,6v12h16z" />

<!-- dark circle behind badge -->
<path
android:fillColor="#1e1e1e"
android:pathData="M18.6,13.6 A5,5 0 1 1 18.6,23.6 A5,5 0 1 1 18.6,13.6 Z" />

<!-- Modrinth badge: translate(14,14) scale(0.009) -->
<group
android:translateX="14"
android:translateY="14"
android:scaleX="0.009"
android:scaleY="0.009">
<path
android:fillColor="#FFFFFF"
android:pathData="M631.010498,764.119751 C605.174500,776.293274 578.436279,784.260498 550.526245,787.931763 C527.852722,790.914124 505.139740,791.028198 482.302551,788.506592 C427.560608,782.462158 379.180603,761.571777 336.789948,726.843140 C301.608124,698.020386 275.390198,662.294678 257.722595,620.341553 C245.268784,590.768982 238.072647,560.040649 236.583878,527.918884 C233.058044,451.846191 256.545288,385.251129 306.908112,328.337250 C345.140717,285.131409 392.827911,257.122559 448.830811,243.576477 C481.801361,235.601486 515.171936,233.998672 548.937195,238.460892 C597.804993,244.918991 641.983521,262.727783 680.946228,292.704163 C736.517456,335.458557 771.414917,391.421234 785.295288,460.281097 C790.629150,486.742279 791.845947,513.484863 789.140930,540.288086 C783.448303,596.694153 762.344788,646.787720 726.211975,690.481934 C700.101257,722.056763 668.323608,746.376709 631.010498,764.119751 M396.092773,326.599884 C378.745300,337.972229 362.733948,350.879089 348.972198,366.526855 C314.494934,405.729248 295.781281,451.369781 293.341278,503.463593 C292.262939,526.486328 294.790009,549.225708 300.982208,571.576660 C313.527527,616.859436 337.949615,654.438416 374.307617,683.930176 C421.770050,722.429443 476.341522,737.814575 537.063782,731.867859 C571.007446,728.543701 602.484619,717.726196 630.934631,699.160461 C684.972107,663.897217 718.648499,614.638000 729.937683,550.746216 C735.273193,520.549866 734.465820,490.346771 727.023193,460.612061 C713.901062,408.186737 685.371643,365.862091 641.447510,334.286957 C595.332214,301.136627 543.560669,288.581573 487.430359,294.540314 C454.892212,297.994507 424.593719,308.902924 396.092773,326.599884 z" />
<path
android:fillColor="#FFFFFF"
android:pathData="M603.194946,555.091370 C600.492981,563.031128 597.991455,570.626099 595.266968,578.140198 C592.259155,586.435730 586.685974,592.384705 578.229675,595.217651 C546.180054,605.954773 514.099426,616.599548 482.033051,627.286560 C459.607483,634.760498 437.156830,642.160767 414.773010,649.757812 C399.289856,655.012878 385.492096,650.680847 377.935669,637.640869 C373.380798,629.780579 373.502472,621.460510 376.303223,613.033630 C387.801636,578.437622 399.314240,543.846252 410.787476,509.241882 C416.811615,491.072632 422.953674,472.939178 428.684418,454.677185 C432.515472,442.468781 439.167847,433.844879 452.040192,429.702271 C491.020721,417.157593 529.787720,403.949646 568.642212,391.013000 C583.175232,386.174225 597.750244,381.459442 612.250061,376.523560 C623.947205,372.541748 634.815857,373.588654 643.755127,382.484375 C652.666260,391.352020 653.992432,402.196136 650.076111,413.951202 C634.448425,460.859528 618.884583,507.789124 603.194946,555.091370 M449.667572,575.175842 C452.521973,578.774048 455.618774,575.944458 458.225983,575.094238 C486.080109,566.010803 513.853882,556.681091 541.663513,547.460693 C544.591919,546.489807 546.450562,544.664062 547.416626,541.751343 C556.797058,513.467957 566.226990,485.200989 575.548096,456.898163 C576.171570,455.005005 577.770569,452.707123 575.559204,450.876556 C573.658691,449.303284 571.435669,450.182678 569.370850,450.868164 C540.932434,460.309113 512.501587,469.772583 484.048431,479.168701 C481.803070,479.910217 480.231262,481.096832 479.492767,483.347168 C469.526062,513.717285 459.557465,544.086914 449.667572,575.175842 z" />
</group>

<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="120dp" android:viewportHeight="21" android:viewportWidth="21" android:width="120dp">

<path android:fillColor="#FFFFFF" android:pathData="m1.5,1.5c0,0 12.6,0 12.6,0 0,0 0,1.8 0,1.8 0,0 1.8,0 1.8,0 0,0 0,1.8 0,1.8 0,0 1.8,0 1.8,0 0,0 0,1.8 0,1.8 0,0 1.8,0 1.8,0 0,0 0,12.6 0,12.6 0,0 -9,0 -9,0 0,0 0,-1.8 0,-1.8 0,0 7.2,0 7.2,0 0,0 0,-9 0,-9 0,0 -5.4,0 -5.4,0 0,0 0,-5.4 0,-5.4 0,0 -9,0 -9,0 0,0 0,7.2 0,7.2 0,0 -1.8,0 -1.8,0 0,0 0,-9 0,-9zM15.9,5.1c0,0 -1.8,0 -1.8,0 0,0 0,1.8 0,1.8 0,0 1.8,0 1.8,0 0,0 0,-1.8 0,-1.8zM5.1,10.5c0,0 1.8,0 1.8,0 0,0 0,1.8 0,1.8 0,0 1.8,0 1.8,0 0,0 0,1.8 0,1.8 0,0 1.8,0 1.8,0 0,0 0,1.8 0,1.8 0,0 -1.8,0 -1.8,0 0,0 0,-1.8 0,-1.8 0,0 -1.8,0 -1.8,0 0,0 0,5.4 0,5.4 0,0 -1.8,0 -1.8,0 0,0 0,-5.4 0,-5.4 0,0 -1.8,0 -1.8,0 0,0 0,1.8 0,1.8 0,0 -1.8,0 -1.8,0 0,0 0,-1.8 0,-1.8 0,0 1.8,0 1.8,0 0,0 0,-1.8 0,-1.8 0,0 1.8,0 1.8,0 0,0 0,-1.8 0,-1.8z" android:strokeWidth="0.018"/>

</vector>
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="120dp" android:viewportHeight="24" android:viewportWidth="24" android:width="120dp">

<path android:fillColor="#FFFFFF" android:pathData="M3,8h4m0,0V6h4v2M7,8v2h4V8m0,0h10M3,16h10m0,0v-2h4v2m-4,0v2h4v-2m0,0h4" android:strokeColor="#FFFFFF" android:strokeLineCap="square" android:strokeWidth="2"/>

<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:height="120dp"
android:viewportHeight="48"
android:viewportWidth="48"
android:width="120dp">

<path android:fillColor="#FFFFFF" android:pathData="M34.907,0L48,0v13.093h-4.363L43.637,4.36L34.907,4.36L34.907,0zM21.821,4.363h4.363v4.365h4.365v4.363L26.181,13.091L26.181,8.728L21.819,8.728v4.363L17.453,13.091L17.453,8.728h4.365L21.819,4.363zM8.728,17.456L13.093,17.456v4.363L8.728,21.819v4.363h4.363v4.365L8.728,30.547L8.728,26.181L4.363,26.181L4.363,21.819h4.365L8.728,17.453zM34.912,17.456h4.363v4.363h4.365v4.363h-4.365v4.365h-4.363L34.912,26.181h4.363L39.275,21.819h-4.363L34.912,17.453zM21.813,21.816h4.365v4.363L21.819,26.179L21.819,21.819zM0,34.907h4.363v8.728L13.093,43.635L13.093,48L0,48v-13.093zM17.453,34.907h4.365v4.363h4.363v-4.363h4.365v4.363L26.181,39.269v4.365L21.819,43.635v-4.365L17.453,39.269v-4.363z"/>

</vector>
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="120dp" android:viewportHeight="24" android:viewportWidth="24" android:width="120dp">

<path android:fillColor="#FFFFFF" android:pathData="M15,5L9,5v2L5,7v2L3,9v2L1,11v6h2v2h2v-2L3,17v-6h2L5,9h4L9,7h6zM23,11h-2v6h-2v2h2v-2h2zM10,13h4v4h-4zM16,11h-2v2h2zM18,9v2h-2L16,9zM18,9L18,7h2v2z"/>
<path android:fillColor="#FFFFFF" android:pathData="M3,8h4m0,0V6h4v2M7,8v2h4V8m0,0h10M3,16h10m0,0v-2h4v2m-4,0v2h4v-2m0,0h4" android:strokeColor="#FFFFFF" android:strokeLineCap="square" android:strokeWidth="2"/>

</vector>
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="120dp" android:viewportHeight="24" android:viewportWidth="24" android:width="120dp">

<path android:fillColor="#FFFFFF" android:pathData="M6,3h12v18L6,21zM8,5v4h3L11,5zM13,5v4h3L16,5zM16,11L8,11v8h8z"/>
<path android:fillColor="#FFFFFF" android:pathData="M15,5L9,5v2L5,7v2L3,9v2L1,11v6h2v2h2v-2L3,17v-6h2L5,9h4L9,7h6zM23,11h-2v6h-2v2h2v-2h2zM10,13h4v4h-4zM16,11h-2v2h2zM18,9v2h-2L16,9zM18,9L18,7h2v2z"/>

</vector>
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="120dp" android:viewportHeight="24" android:viewportWidth="24" android:width="120dp">

<path android:fillColor="#FFFFFF" android:pathData="M13,0h-2v2H9v2H7v2h2V4h2v7H4V9h2V7H4v2H2v2H0v2h2v2h2v2h2v-2H4v-2h7v7H9v-2H7v2h2v2h2v2h2v-2h2v-2h2v-2h-2v2h-2v-7h7v2h-2v2h2v-2h2v-2h2v-2h-2V9h-2V7h-2v2h2v2h-7V4h2v2h2V4h-2V2h-2z"/>
<path android:fillColor="#FFFFFF" android:pathData="M6,3h12v18L6,21zM8,5v4h3L11,5zM13,5v4h3L16,5zM16,11L8,11v8h8z"/>

</vector>
Loading