From 6d1570d289a03344a466240045dfa7ae9acae4eb Mon Sep 17 00:00:00 2001 From: shedaniel Date: Sat, 19 Feb 2022 02:06:26 +0800 Subject: [PATCH 1/2] Fix EventBuses always failing --- .../main/java/dev/architectury/platform/forge/EventBuses.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/forge/src/main/java/dev/architectury/platform/forge/EventBuses.java b/forge/src/main/java/dev/architectury/platform/forge/EventBuses.java index a37b694b..75ec6a4a 100644 --- a/forge/src/main/java/dev/architectury/platform/forge/EventBuses.java +++ b/forge/src/main/java/dev/architectury/platform/forge/EventBuses.java @@ -32,7 +32,7 @@ public final class EventBuses { private static final Map>> ON_REGISTERED = new HashMap<>(); public static void registerModEventBus(String modId, IEventBus bus) { - if (EVENT_BUS_MAP.putIfAbsent(modId, bus) != bus) { + if (EVENT_BUS_MAP.putIfAbsent(modId, bus) != null) { throw new IllegalStateException("Can't register event bus for mod '" + modId + "' because it was previously registered!"); } From e0cbeb45ed6f856dab6b8725274ec66e88a4f900 Mon Sep 17 00:00:00 2001 From: shedaniel Date: Sun, 20 Feb 2022 00:35:33 +0800 Subject: [PATCH 2/2] Mark OptiFabric as incompatible (#203) --- fabric/src/main/resources/fabric.mod.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json index 875fe0ae..fb8e81bf 100644 --- a/fabric/src/main/resources/fabric.mod.json +++ b/fabric/src/main/resources/fabric.mod.json @@ -39,6 +39,9 @@ "fabricloader": ">=0.13.0", "fabric": ">=0.44.0" }, + "breaks": { + "optifabric": "*" + }, "custom": { "modmenu:api": true }