Skip to content

Commit 7f75ac0

Browse files
committed
Rewrite neoforge impl to support new IConfigScreenFactory
1 parent 53b2602 commit 7f75ac0

2 files changed

Lines changed: 12 additions & 7 deletions

File tree

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ org.gradle.jvmargs=-Xmx4096M
22
archives_base_name=infrastructury-tiny
33
mod_id=infrastructury-tiny
44
mod_name=Infrastructury Tiny
5-
mod_version=0.2.4
5+
mod_version=0.2.5
66
mod_description=Cross-version modding API
77
maven_group=com.mrmelon54.infrastructury-tiny
88
# Plugin versions

neoforge/src/main/java/com/mrmelon54/infrastructury/neoforge/InfrastructuryImpl.java

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,23 @@
22

33
import com.mrmelon54.infrastructury.utils.ConfigScreenRegistrar;
44
import net.neoforged.fml.ModLoadingContext;
5-
#if MC_VER <= MC_1_20_4
6-
import net.neoforged.neoforge.client.ConfigScreenHandler.ConfigScreenFactory;
7-
#else
5+
#if MC_VER >= MC_1_21_1
6+
import net.neoforged.neoforge.client.gui.IConfigScreenFactory;
7+
import net.minecraft.client.Minecraft;
8+
#elif MC_VER >= MC_1_20_6
89
import net.neoforged.neoforge.client.gui.IConfigScreenFactory;
10+
#else
11+
import net.neoforged.neoforge.client.ConfigScreenHandler.ConfigScreenFactory;
912
#endif
1013

1114
public class InfrastructuryImpl {
1215
public static void registerConfigScreen(ConfigScreenRegistrar registrar) {
13-
#if MC_VER <= MC_1_20_4
14-
ModLoadingContext.get().registerExtensionPoint(ConfigScreenFactory.class, () -> new ConfigScreenFactory(registrar::registerConfigScreen));
15-
#else
16+
#if MC_VER >= MC_1_21_1
17+
ModLoadingContext.get().registerExtensionPoint(IConfigScreenFactory.class, () -> (modContainer, parent) -> registrar.registerConfigScreen(Minecraft.getInstance(), parent));
18+
#elif MC_VER >= MC_1_20_6
1619
ModLoadingContext.get().registerExtensionPoint(IConfigScreenFactory.class, () -> registrar::registerConfigScreen);
20+
#else
21+
ModLoadingContext.get().registerExtensionPoint(ConfigScreenFactory.class, () -> new ConfigScreenFactory(registrar::registerConfigScreen));
1722
#endif
1823
}
1924
}

0 commit comments

Comments
 (0)