From 32556a748758e604376d30d5fff5a36dfaab8c04 Mon Sep 17 00:00:00 2001 From: Ryan Fortner <71036629+chunky-milk@users.noreply.github.com> Date: Fri, 18 Jun 2021 12:10:39 -0400 Subject: [PATCH 1/6] Update install-32 --- apps/Minecraft Java/install-32 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/apps/Minecraft Java/install-32 b/apps/Minecraft Java/install-32 index 25582e0..aeee54d 100755 --- a/apps/Minecraft Java/install-32 +++ b/apps/Minecraft Java/install-32 @@ -12,8 +12,8 @@ function error { # || error 'reason' #example below: -#Download java and launcher -mkdir ~/Minecraft && cd ~/Minecraft && wget https://github.com/mikehooper/Minecraft/raw/main/setupMC.sh && chmod +x setupMC.sh && ./setupMC.sh || error 'Failed to install the launcher!' +#Run modified setupMC.sh +mkdir ~/Minecraft && cd ~/Minecraft && wget https://github.com/chunky-milk/Minecraft/raw/main/setupMC.sh && chmod +x setupMC.sh && ./setupMC.sh || error 'Failed to install the launcher!' #Move launcher to /usr/share/ sudo mkdir /usr/share/minecraftjava && sudo mv launcher.jar /usr/share/minecraftjava/launcher.jar @@ -36,6 +36,7 @@ echo '{ "profiles": { "(Default)": { "name": "(Default)", + "javaDir": "/opt/jdk-16.0.1+4/bin/java", "javaArgs": "-Dorg.lwjgl.librarypath='$HOME'/lwjgl3arm32 -Xmx1G -XX:+UseConcMarkSweepGC -XX:+CMSIncrementalMode -XX:-UseAdaptiveSizePolicy -Xmn128M" } }, From cd94ba1cb6791f463c98fcb4d2b2985f74f5b9d3 Mon Sep 17 00:00:00 2001 From: Ryan Fortner <71036629+chunky-milk@users.noreply.github.com> Date: Fri, 18 Jun 2021 12:11:52 -0400 Subject: [PATCH 2/6] Update install-64 --- apps/Minecraft Java/install-64 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/Minecraft Java/install-64 b/apps/Minecraft Java/install-64 index 8a6e04e..3f62cd5 100755 --- a/apps/Minecraft Java/install-64 +++ b/apps/Minecraft Java/install-64 @@ -13,7 +13,7 @@ function error { #example below: #Download java and launcher -mkdir ~/Minecraft && cd ~/Minecraft && wget https://github.com/mikehooper/Minecraft/raw/main/setupMC.sh && chmod +x setupMC.sh && ./setupMC.sh || error 'Failed to install the launcher!' +mkdir ~/Minecraft && cd ~/Minecraft && wget https://github.com/chunky-milk/Minecraft/raw/main/setupMC.sh && chmod +x setupMC.sh && ./setupMC.sh || error 'Failed to install the launcher!' #Move launcher to /usr/share/ sudo mkdir /usr/share/minecraftjava && sudo mv launcher.jar /usr/share/minecraftjava/launcher.jar @@ -36,7 +36,7 @@ echo '{ "profiles": { "(Default)": { "name": "(Default)", - "javaDir": "/opt/jdk/jdk1.8.0_251/bin/java", + "javaDir": "/opt/jdk-16.0.1+9/bin/java", "javaArgs": "-Dorg.lwjgl.librarypath='$HOME'/lwjgl3arm64 -Xmx1G -XX:+UseConcMarkSweepGC -XX:+CMSIncrementalMode -XX:-UseAdaptiveSizePolicy -Xmn128M" } }, From 7ba4deb3c48d8faa1d05dec0feb2c0cc7e9e7ee2 Mon Sep 17 00:00:00 2001 From: Ryan Fortner <71036629+chunky-milk@users.noreply.github.com> Date: Fri, 18 Jun 2021 12:18:56 -0400 Subject: [PATCH 3/6] Update uninstall --- apps/Minecraft Java/uninstall | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/Minecraft Java/uninstall b/apps/Minecraft Java/uninstall index ab2fb2d..faca6a1 100755 --- a/apps/Minecraft Java/uninstall +++ b/apps/Minecraft Java/uninstall @@ -14,3 +14,4 @@ sudo rm -rf ~/lwjgl3arm32 sudo rm -rf ~/lwjgl3arm64 sudo rm -rf ~/lwjgl2arm64 sudo rm -rf /usr/share/minecraftjava/ +sudo rm -rf /opt/jdk-16.0.1+9 || sudo rm -rf /opt/jdk-16.0.1+4 From 23cca43d21e1ecba8ae37bfdfc08d97a93abb2f5 Mon Sep 17 00:00:00 2001 From: Ryan Fortner <71036629+chunky-milk@users.noreply.github.com> Date: Fri, 18 Jun 2021 13:07:50 -0400 Subject: [PATCH 4/6] Update install-32 --- apps/Minecraft Java/install-32 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/Minecraft Java/install-32 b/apps/Minecraft Java/install-32 index aeee54d..9fc3dcf 100755 --- a/apps/Minecraft Java/install-32 +++ b/apps/Minecraft Java/install-32 @@ -37,7 +37,7 @@ echo '{ "(Default)": { "name": "(Default)", "javaDir": "/opt/jdk-16.0.1+4/bin/java", - "javaArgs": "-Dorg.lwjgl.librarypath='$HOME'/lwjgl3arm32 -Xmx1G -XX:+UseConcMarkSweepGC -XX:+CMSIncrementalMode -XX:-UseAdaptiveSizePolicy -Xmn128M" + "javaArgs": "-Dorg.lwjgl.librarypath='$HOME'/lwjgl3arm32 -Xmx1G -XX:-UseAdaptiveSizePolicy -Xmn128M" } }, "selectedProfile": "(Default)", From 06f8001b4b060dbe3137c51a3458fe86678a4a8a Mon Sep 17 00:00:00 2001 From: Ryan Fortner <71036629+chunky-milk@users.noreply.github.com> Date: Fri, 18 Jun 2021 13:08:20 -0400 Subject: [PATCH 5/6] Update install-64 --- apps/Minecraft Java/install-64 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/Minecraft Java/install-64 b/apps/Minecraft Java/install-64 index 3f62cd5..d03402d 100755 --- a/apps/Minecraft Java/install-64 +++ b/apps/Minecraft Java/install-64 @@ -37,7 +37,7 @@ echo '{ "(Default)": { "name": "(Default)", "javaDir": "/opt/jdk-16.0.1+9/bin/java", - "javaArgs": "-Dorg.lwjgl.librarypath='$HOME'/lwjgl3arm64 -Xmx1G -XX:+UseConcMarkSweepGC -XX:+CMSIncrementalMode -XX:-UseAdaptiveSizePolicy -Xmn128M" + "javaArgs": "-Dorg.lwjgl.librarypath='$HOME'/lwjgl3arm64 -Xmx1G -XX:-UseAdaptiveSizePolicy -Xmn128M" } }, "selectedProfile": "(Default)", From 7c0b799d080544a10c02ae0c588a6917e9ea67dd Mon Sep 17 00:00:00 2001 From: chunky-milk Date: Sat, 19 Jun 2021 11:03:20 -0400 Subject: [PATCH 6/6] select user home directory correctly --- apps/Minecraft Java/install-32 | 2 +- apps/Minecraft Java/install-64 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/Minecraft Java/install-32 b/apps/Minecraft Java/install-32 index 9fc3dcf..273d20d 100755 --- a/apps/Minecraft Java/install-32 +++ b/apps/Minecraft Java/install-32 @@ -32,7 +32,7 @@ chmod +x minecraft.desktop cd mkdir -p ~/.minecraft -echo '{ +echo -e '{ "profiles": { "(Default)": { "name": "(Default)", diff --git a/apps/Minecraft Java/install-64 b/apps/Minecraft Java/install-64 index d03402d..0e63189 100755 --- a/apps/Minecraft Java/install-64 +++ b/apps/Minecraft Java/install-64 @@ -32,7 +32,7 @@ chmod +x minecraft.desktop cd mkdir -p ~/.minecraft -echo '{ +echo -e '{ "profiles": { "(Default)": { "name": "(Default)",