Merge 1.16 into 1.18

embeddedt · embeddedt · commit 0a72abb5191a · 2023-10-28T20:06:00.000-04:00
diff --git a/forge/src/main/java/org/embeddedt/modernfix/platform/forge/ModernFixPlatformHooksImpl.java b/forge/src/main/java/org/embeddedt/modernfix/platform/forge/ModernFixPlatformHooksImpl.java
@@ -153,6 +153,8 @@ public void injectPlatformSpecificHacks() {
             noGroupField.setAccessible(true);
             InjectorGroupInfo noGroup = (InjectorGroupInfo)noGroupField.get(null);
             groupMembersField.set(noGroup, new DummyList<>());
+        } catch(NoSuchFieldException ignored) {
+            // Connector will replace FML's mixin with one which already has the fix, don't bother logging
         } catch(RuntimeException | ReflectiveOperationException e) {
             ModernFixMixinPlugin.instance.logger.error("Failed to patch mixin memory leak", e);
         }

Original file line number	Diff line number	Diff line change
`@@ -153,6 +153,8 @@ public void injectPlatformSpecificHacks() {`
`153`	`153`	`noGroupField.setAccessible(true);`
`154`	`154`	`InjectorGroupInfo noGroup = (InjectorGroupInfo)noGroupField.get(null);`
`155`	`155`	`groupMembersField.set(noGroup, new DummyList<>());`
	`156`	`+ } catch(NoSuchFieldException ignored) {`
	`157`	`+ // Connector will replace FML's mixin with one which already has the fix, don't bother logging`
`156`	`158`	`} catch(RuntimeException \| ReflectiveOperationException e) {`
`157`	`159`	`ModernFixMixinPlugin.instance.logger.error("Failed to patch mixin memory leak", e);`
`158`	`160`	`}`