From 57f45eaca04d8b63feaba948c54bff7edb85af54 Mon Sep 17 00:00:00 2001
From: cpw <cpw+github@weeksfamily.ca>
Date: Sat, 9 Jul 2022 10:42:30 -0400
Subject: [PATCH] Update SJH and JIJ

---
 build.gradle          | 11 +++++++----
 server_files/args.txt |  1 +
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/build.gradle b/build.gradle
index 8e449bd891..a09a25d296 100644
--- a/build.gradle
+++ b/build.gradle
@@ -43,9 +43,9 @@ ext {
     ACCESSTRANSFORMERS_VERSION = '8.0.4'
     COREMODS_VERSION = '5.0.1'
     EVENTBUS_VERSION = '6.0.0'
-    MODLAUNCHER_VERSION = '10.0.1'
-    SECUREJARHANDLER_VERSION = '2.0.3'
-    BOOTSTRAPLAUNCHER_VERSION = '1.1.1'
+    MODLAUNCHER_VERSION = '10.0.8'
+    SECUREJARHANDLER_VERSION = '2.1.4'
+    BOOTSTRAPLAUNCHER_VERSION = '1.1.2'
     ASM_VERSION = '9.3'
     INSTALLER_VERSION = '2.1.+'
     MIXIN_VERSION = '0.8.5'
@@ -65,7 +65,7 @@ ext {
     APACHE_COMMONS_LANG3_VERSION = '3.12.0'
     JOPT_SIMPLE_VERSION = '5.0.4'
     COMMONS_IO_VERSION = '2.11.0'
-    JARJAR_VERSION = '0.2.24'
+    JARJAR_VERSION = '0.2.26'
 
     GIT_INFO = gradleutils.gitInfo
     VERSION = gradleutils.getFilteredMCTagOffsetBranchVersion(true, '[0-9]', MC_VERSION)
@@ -453,6 +453,7 @@ def sharedFmlonlyForge = { Project prj ->
         run.jvmArgs '--add-modules', 'ALL-MODULE-PATH'
         // Additions to these JVM module args should be mirrored to server_files/args.txt and other similar blocks in the buildscript
         run.jvmArgs '--add-opens', 'java.base/java.util.jar=cpw.mods.securejarhandler'
+        run.jvmArgs '--add-opens', 'java.base/java.lang.invoke=cpw.mods.securejarhandler'
         run.jvmArgs '--add-exports', 'java.base/sun.security.util=cpw.mods.securejarhandler'
         run.jvmArgs '--add-exports', 'jdk.naming.dns/com.sun.jndi.dns=java.naming'
     }
@@ -644,6 +645,7 @@ project(':fmlonly') {
                           '--add-modules', 'ALL-MODULE-PATH',
                           // Additions to these JVM module args should be mirrored to server_files/args.txt and other similar blocks in the buildscript
                           '--add-opens', 'java.base/java.util.jar=cpw.mods.securejarhandler',
+                          '--add-opens', 'java.base/java.lang.invoke=cpw.mods.securejarhandler',
                           '--add-exports', 'java.base/sun.security.util=cpw.mods.securejarhandler',
                           '--add-exports', 'jdk.naming.dns/com.sun.jndi.dns=java.naming'
                     ]
@@ -1275,6 +1277,7 @@ project(':forge') {
                           '--add-modules', 'ALL-MODULE-PATH',
                           // Additions to these JVM module args should be mirrored to server_files/args.txt and other similar blocks in the buildscript
                           '--add-opens', 'java.base/java.util.jar=cpw.mods.securejarhandler',
+                          '--add-opens', 'java.base/java.lang.invoke=cpw.mods.securejarhandler',
                           '--add-exports', 'java.base/sun.security.util=cpw.mods.securejarhandler',
                           '--add-exports', 'jdk.naming.dns/com.sun.jndi.dns=java.naming'
                     ]
diff --git a/server_files/args.txt b/server_files/args.txt
index 6dd9824f33..84df94b0e5 100644
--- a/server_files/args.txt
+++ b/server_files/args.txt
@@ -1,6 +1,7 @@
 -p @MODULE_PATH@
 --add-modules @MODULES@
 --add-opens java.base/java.util.jar=cpw.mods.securejarhandler
+--add-opens java.base/java.lang.invoke=cpw.mods.securejarhandler
 --add-exports java.base/sun.security.util=cpw.mods.securejarhandler
 --add-exports jdk.naming.dns/com.sun.jndi.dns=java.naming
 -Djava.net.preferIPv6Addresses=system