imports/architectury-api
1
0
Fork 0
mirror of https://github.com/architectury/architectury-api.git synced 2026-03-30 05:05:19 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'architectury/1.18' into 1.18.2

Browse Source
This commit is contained in:
shedaniel
2022-02-27 18:13:36 +08:00
parent 8393cabe20 e0cbeb45ed
commit 4508b98573
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
fabric/src/main/resources/fabric.mod.json
View File

@@ -39,6 +39,9 @@
"fabricloader": ">=0.13.0",
"fabric": ">=0.44.0"
},
"breaks": {
"optifabric": "*"
},
"custom": {
"modmenu:api": true
}

2
forge/src/main/java/dev/architectury/platform/forge/EventBuses.java
View File

@@ -32,7 +32,7 @@ public final class EventBuses {
private static final Map<String, List<Consumer<IEventBus>>> 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!");
}