Skip to content

Commit 37d4945

Browse files
committed
Implement enable_gui for neoforge
1 parent 9325b4c commit 37d4945

2 files changed

Lines changed: 19 additions & 6 deletions

File tree

neoforge/build.gradle.kts

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@ neoForge {
3838
}
3939
}
4040

41+
val gui = rootProject.property("enable_gui").toString() == "true"
42+
4143
dependencies {
4244
runtimeOnly(rootProject.sourceSets.main.get().output)
4345
shadow(project(":"))
@@ -48,8 +50,12 @@ dependencies {
4850
libs(libs.snakeyaml)
4951
"additionalRuntimeClasspath"(libs.snakeyaml)
5052

51-
implementation(libs.clothConfig.neoforge)
52-
jarJar(libs.clothConfig.neoforge)
53+
if (gui) {
54+
implementation(libs.clothConfig.neoforge)
55+
jarJar(libs.clothConfig.neoforge)
56+
} else {
57+
compileOnly(libs.clothConfig.neoforge)
58+
}
5359
}
5460

5561
tasks.processResources {

neoforge/src/main/java/ca/spottedleaf/moonrise/neoforge/MoonriseNeoForge.java

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import ca.spottedleaf.moonrise.patches.command.MoonriseCommand;
55
import com.mojang.brigadier.CommandDispatcher;
66
import net.neoforged.bus.api.IEventBus;
7+
import net.neoforged.fml.ModList;
78
import net.neoforged.fml.ModLoadingContext;
89
import net.neoforged.fml.common.Mod;
910
import net.neoforged.fml.event.lifecycle.FMLClientSetupEvent;
@@ -16,13 +17,19 @@ public final class MoonriseNeoForge {
1617
@SuppressWarnings({"rawtypes", "unchecked"})
1718
public MoonriseNeoForge(final IEventBus modBus) {
1819
modBus.addListener(FMLClientSetupEvent.class, event -> {
19-
ModLoadingContext.get().registerExtensionPoint(
20-
IConfigScreenFactory.class,
21-
() -> (modContainer, parent) -> MoonriseConfigScreen.create(parent)
22-
);
20+
if (hasCloth()) {
21+
ModLoadingContext.get().registerExtensionPoint(
22+
IConfigScreenFactory.class,
23+
() -> (modContainer, parent) -> MoonriseConfigScreen.create(parent)
24+
);
25+
}
2326
NeoForge.EVENT_BUS.addListener((final RegisterClientCommandsEvent commandsEvent) -> {
2427
MoonriseCommand.registerClient((CommandDispatcher) commandsEvent.getDispatcher());
2528
});
2629
});
2730
}
31+
32+
private static boolean hasCloth() {
33+
return ModList.get().isLoaded("cloth_config");
34+
}
2835
}

0 commit comments

Comments
 (0)