Merge 1.18 into 1.19.2

Author: embeddedt

forge/src/main/java/org/embeddedt/modernfix/forge/config/ConfigFixer.java

@@ -50,7 +50,8 @@ public void accept(IConfigEvent modConfigEvent) {
                     this.actualHandler.accept(modConfigEvent);
                 }
             } else {
-                ModernFix.LOGGER.warn("Unable to sync on a {} config object", modConfigEvent.getConfig().getConfigData().getClass().getName());
+                if(modConfigEvent.getConfig().getConfigData() != null)
+                    ModernFix.LOGGER.warn("Unable to sync on a {} config object", modConfigEvent.getConfig().getConfigData().getClass().getName());
                 this.actualHandler.accept(modConfigEvent);
             }
         }

forge/src/main/java/org/embeddedt/modernfix/forge/config/NightConfigFixer.java

@@ -85,6 +85,8 @@ public Object computeIfAbsent(Path key, Function<? super Path, ?> mappingFunctio
     private static final Set<Class<?>> UNKNOWN_FILE_CONFIG_CLASSES = Collections.synchronizedSet(new ReferenceOpenHashSet<>());
 
     public static Object toWriteSyncConfig(Object config) {
+        if(config == null)
+            return null;
         try {
             if(WRITE_SYNC_CONFIG.isAssignableFrom(config.getClass())) {
                 return config;

forge/src/main/java/org/embeddedt/modernfix/forge/dynresources/ModelBakeEventHelper.java

@@ -17,10 +17,7 @@
 import org.embeddedt.modernfix.dynamicresources.ModelLocationCache;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
+import java.util.*;
 
 /**
  * Stores a list of all known default block/item models in the game, and provides a namespaced version
@@ -54,7 +51,9 @@ public ModelBakeEventHelper(Map<ResourceLocation, BakedModel> modelRegistry) {
             Optional<? extends ModContainer> mContainer = ModList.get().getModContainerById(id);
             if(mContainer.isPresent()) {
                 for(IModInfo.ModVersion version : mContainer.get().getModInfo().getDependencies()) {
-                    this.dependencyGraph.putEdge(id, version.getModId());
+                    // avoid self-loops
+                    if(!Objects.equals(id, version.getModId()))
+                        this.dependencyGraph.putEdge(id, version.getModId());
                 }
             }
         }

forge/src/main/java/org/embeddedt/modernfix/forge/mixin/bugfix/cofh_core_crash/FlagManagerMixin.java

@@ -0,0 +1,36 @@
+package org.embeddedt.modernfix.forge.mixin.bugfix.cofh_core_crash;
+
+import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
+import org.embeddedt.modernfix.annotation.RequiresMod;
+import org.spongepowered.asm.mixin.*;
+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;
+
+/**
+ * Fix getOrCreateFlag accessing the FLAGS map without synchronization by wrapping all calls to it
+ * in a synchronized block.
+ */
+@Pseudo
+@Mixin(targets = { "cofh/lib/util/flags/FlagManager" }, remap = false)
+@RequiresMod("cofh_core")
+public class FlagManagerMixin {
+    @Shadow @Final
+    private static Object2ObjectOpenHashMap<String, BooleanSupplier> FLAGS;
+
+    @Shadow
+    private BooleanSupplier getOrCreateFlag(String flag) {
+        throw new AssertionError();
+    }
+
+    @Redirect(method = "*", at = @At(value = "INVOKE", target = "getOrCreateFlag"), require = 0)
+    private BooleanSupplier getFlag(@Coerce Object flagHandler, String flag) {
+        if(flagHandler != this)
+            throw new AssertionError("Redirect targeted bad getOrCreateFlag invocation");
+        synchronized (FLAGS) {
+            return this.getOrCreateFlag(flag);
+        }
+    }
+}