From 5338cca79b5ad97786c32724816137aed9970dca Mon Sep 17 00:00:00 2001 From: embeddedt <42941056+embeddedt@users.noreply.github.com> Date: Mon, 24 Jul 2023 14:19:02 -0400 Subject: [PATCH] Adjust patch for 1.18 FlagManager --- .../mixin/bugfix/cofh_core_crash/FlagManagerMixin.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/bugfix/cofh_core_crash/FlagManagerMixin.java b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/bugfix/cofh_core_crash/FlagManagerMixin.java index f39e12e1..afbfaa0e 100644 --- a/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/bugfix/cofh_core_crash/FlagManagerMixin.java +++ b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/bugfix/cofh_core_crash/FlagManagerMixin.java @@ -7,7 +7,7 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Coerce; import org.spongepowered.asm.mixin.injection.Redirect; -import java.util.function.BooleanSupplier; +import java.util.function.Supplier; /** * Fix getOrCreateFlag accessing the FLAGS map without synchronization by wrapping all calls to it @@ -18,15 +18,15 @@ import java.util.function.BooleanSupplier; @RequiresMod("cofh_core") public class FlagManagerMixin { @Shadow @Final - private static Object2ObjectOpenHashMap FLAGS; + private static Object2ObjectOpenHashMap> FLAGS; @Shadow - private BooleanSupplier getOrCreateFlag(String flag) { + private Supplier getOrCreateFlag(String flag) { throw new AssertionError(); } @Redirect(method = "*", at = @At(value = "INVOKE", target = "getOrCreateFlag"), require = 0) - private BooleanSupplier getFlag(@Coerce Object flagHandler, String flag) { + private Supplier getFlag(@Coerce Object flagHandler, String flag) { if(flagHandler != this) throw new AssertionError("Redirect targeted bad getOrCreateFlag invocation"); synchronized (FLAGS) {