Now that multimc can play the most up to date version of Minecraft, here
is a patch to set it up to play 1.16 by default.

Of course I don't want to wreck the experience for people playing older
versions or modded, so I added a pkg-readme, with instructions for how
to configure older versions.

Tested with 1.12, 1.16, and snap 21w08b.

Can you check this with known- tricky versions and combinations?

OK?


Index: games/multimc/Makefile
===================================================================
RCS file: /home/cvs/openbsd/ports/games/multimc/Makefile,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 Makefile
--- games/multimc/Makefile      28 Feb 2021 09:54:38 -0000      1.2
+++ games/multimc/Makefile      28 Feb 2021 09:57:11 -0000
@@ -5,7 +5,7 @@ COMMENT =               free and open-source launcher
 # git clone --recurse-submodules -b 0.6.11 https://github.com/MultiMC/MultiMC5
 DISTNAME =             multimc-0.6.11
 MASTER_SITES =         https://distfiles.yukiisbo.red/
-REVISION =             0
+REVISION =             1
 
 CATEGORIES =           games
 
@@ -22,13 +22,13 @@ WANTLIB +=          Qt5Network Qt5Widgets Qt5Xml
 MODULES =              devel/cmake \
                        x11/qt5 \
                        java
-MODJAVA_VER =          1.8
+MODJAVA_VER =          11
 
 RUN_DEPENDS =          audio/openal \
-                       games/lwjgl \
                        games/lwjgl3 \
                        java/javaPathHelper
 
+# Keep lwjgl directory for the optional dependency
 CXXFLAGS +=    -DLWJGL_DIR='\"${LOCALBASE}/share/lwjgl/\"' \
                -DLWJGL3_DIR='\"${LOCALBASE}/share/lwjgl3/\"' \
                -DJAVAPATHHELPER_PATH='\"${LOCALBASE}/bin/javaPathHelper\"'
Index: games/multimc/pkg/PLIST
===================================================================
RCS file: /home/cvs/openbsd/ports/games/multimc/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 PLIST
--- games/multimc/pkg/PLIST     21 Sep 2020 07:22:37 -0000      1.1.1.1
+++ games/multimc/pkg/PLIST     28 Feb 2021 10:36:28 -0000
@@ -7,6 +7,7 @@
 @so lib/libMultiMC_quazip.so
 @so lib/libMultiMC_rainbow.so
 @so lib/libMultiMC_unpack200.so
+share/doc/pkg-readmes/${PKGSTEM}
 share/multimc/
 share/multimc/jars/
 share/multimc/jars/JavaCheck.jar
Index: games/multimc/pkg/README
===================================================================
RCS file: games/multimc/pkg/README
diff -N games/multimc/pkg/README
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ games/multimc/pkg/README    28 Feb 2021 11:48:46 -0000
@@ -0,0 +1,8 @@
+The defaults of multimc are set up to play the most recent release of
+Minecraft.  Older versions of Minecraft can still be played, with some
+optional settings.
+
+To play Minecraft 1.12 and older:
+# pkg_add lwjgl jdk%1.8
+Add the instance you wish to play, then Edit Instance | Settings
+and change Java installation to use /usr/local/jdk-1.8.0/bin/java


-- 
The only problem with being a man of leisure is that you can never stop
and take a rest.

Reply via email to