Skip to content

Commit dc25cc8

Browse files
authored
Merge pull request #49 from MIA-Development-Team/fix/configloaderror
fix: config event handling
2 parents baa56f0 + d212331 commit dc25cc8

3 files changed

Lines changed: 9 additions & 10 deletions

File tree

src/main/java/com/altnoir/mia/MiaConfig.java

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
package com.altnoir.mia;
22

33
import net.neoforged.bus.api.SubscribeEvent;
4-
import net.neoforged.fml.common.EventBusSubscriber;
54
import net.neoforged.fml.event.config.ModConfigEvent;
65
import net.neoforged.neoforge.common.ModConfigSpec;
76

8-
@EventBusSubscriber(modid = MIA.MOD_ID, bus = EventBusSubscriber.Bus.MOD)
7+
98
public class MiaConfig {
109
private static final ModConfigSpec.Builder COMMON_BUILDER = new ModConfigSpec.Builder();
1110
private static final ModConfigSpec.Builder SERVER_BUILDER = new ModConfigSpec.Builder();
@@ -41,8 +40,7 @@ public enum DisconnectButtonState {
4140
public static final ModConfigSpec COMMON_SPEC = COMMON_BUILDER.build();
4241
public static final ModConfigSpec SERVER_SPEC = SERVER_BUILDER.build();
4342

44-
@SubscribeEvent
45-
public static void onLoad(final ModConfigEvent event) {
43+
private static void loadValues(ModConfigEvent event) {
4644
if (event.getConfig().getSpec() == COMMON_SPEC) {
4745
abyssRadius = ABYSS_RADIUS.get();
4846
disconnectButtonState = DISCONNECT_BUTTON_STATE.get();
@@ -53,4 +51,10 @@ public static void onLoad(final ModConfigEvent event) {
5351
curseGod = CURSE_GOD.get();
5452
}
5553
}
54+
55+
public static void loadEvent(final ModConfigEvent event) {
56+
if (event instanceof ModConfigEvent.Loading || event instanceof ModConfigEvent.Reloading) {
57+
loadValues(event);
58+
}
59+
}
5660
}

src/main/java/com/altnoir/mia/client/event/ClientEventHandler.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ public static void addListener(IEventBus modEventBus, IEventBus gameEventBus) {
1515

1616
public static void addModEventBus(IEventBus modEventBus) {
1717
modEventBus.addListener(MiaClientConfig::onLoad);
18-
1918
modEventBus.addListener(ClientDimEffects::registerDimensionEffects);
2019
modEventBus.addListener(RegisterParticlesEvent::registerParticles);
2120
modEventBus.addListener(ClientTooltipComponentEvent::onRegisterFactories);
@@ -28,7 +27,6 @@ public static void addGameEventBus(IEventBus gameEventBus) {
2827
gameEventBus.addListener(ClientCurseEvent::ScreenEventInitPost);
2928
gameEventBus.addListener(ClientCurseEvent::onRenderOverlay);
3029
gameEventBus.addListener(ClientTooltipEvent::onTooltip);
31-
3230
gameEventBus.addListener(KeyArrowEvent::onClientTick);
3331
gameEventBus.addListener(KeyArrowEvent::onRenderGui);
3432
}

src/main/java/com/altnoir/mia/init/event/EventHandle.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,10 @@ public static void addListener(IEventBus modEventBus, IEventBus gameEventBus) {
1515
}
1616

1717
public static void addModEventBus(IEventBus modEventBus) {
18-
modEventBus.addListener(MiaConfig::onLoad);
19-
18+
modEventBus.addListener(MiaConfig::loadEvent);
2019
modEventBus.addListener(DataGenerators::gatherData);
21-
2220
modEventBus.addListener(MiaNetworking::register);
2321
modEventBus.addListener(CurseEvent::attachEntityCapabilities);
24-
2522
modEventBus.addListener(CapabilityRegister::RegisterCapabilitiesEvent);
2623
modEventBus.addListener(PlayerAttributeEvent::addPlayerAttributes);
2724
}

0 commit comments

Comments
 (0)