firstdarkdev/CraterLib
1
0
Fork 0
Code Issues 3 Pull Requests Actions Projects Activity

[DEV] New Cloth Config GUIs, new nojang apis, and bug fixes

Browse Source
This commit is contained in:
HypherionSA
2025-01-14 15:53:58 +02:00
parent aded006f30
commit 5d0ad68c64
27 changed files with 682 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
NeoForge/build.gradle
View File

@@ -7,6 +7,8 @@ dependencies {
stupidRemapArch("dev.ftb.mods:ftb-essentials-neoforge:${ftb_essentials}")
stupidRemapArch("dev.ftb.mods:ftb-ranks-neoforge:${ftb_ranks}")
modImplementation("me.shedaniel.cloth:cloth-config-neoforge:${cloth_config}")
// Do not edit or remove
implementation project(":Common")
}
@@ -114,10 +116,18 @@ publisher {
setVersionType("release")
setChangelog(rootProject.file("changelog.md"))
setProjectVersion("${minecraft_version}-${project.version}")
setDisplayName("[NeoForge 1.21.3] CraterLib - ${project.version}")
setGameVersions("1.21.3")
setDisplayName("[NeoForge 1.21.3/1.21.4] CraterLib - ${project.version}")
setGameVersions("1.21.3", "1.21.4")
setLoaders("neoforge")
setArtifact(remapJar)
setCurseEnvironment("both")
setIsManualRelease(true)
curseDepends {
optional("cloth-config")
}
modrinthDepends {
optional("cloth-config")
}
}

14
NeoForge/src/main/java/com/hypherionmc/craterlib/client/NeoForgeClientHelper.java
View File

@@ -1,12 +1,15 @@
package com.hypherionmc.craterlib.client;
import com.hypherionmc.craterlib.api.events.client.LateInitEvent;
import com.hypherionmc.craterlib.client.gui.config.ClothConfigScreenBuilder;
import com.hypherionmc.craterlib.client.gui.config.CraterConfigScreen;
import com.hypherionmc.craterlib.core.config.AbstractConfig;
import com.hypherionmc.craterlib.core.config.ConfigController;
import com.hypherionmc.craterlib.core.config.annotations.ClothScreen;
import com.hypherionmc.craterlib.core.config.annotations.NoConfigScreen;
import com.hypherionmc.craterlib.core.event.CraterEventBus;
import com.hypherionmc.craterlib.core.platform.ClientPlatform;
import com.hypherionmc.craterlib.core.platform.ModloaderEnvironment;
import com.hypherionmc.craterlib.nojang.client.BridgedMinecraft;
import com.hypherionmc.craterlib.nojang.client.BridgedOptions;
import com.hypherionmc.craterlib.nojang.client.multiplayer.BridgedClientLevel;
@@ -52,9 +55,14 @@ public class NeoForgeClientHelper implements ClientPlatform {
CraterEventBus.INSTANCE.postEvent(event);
ConfigController.getWatchedConfigs().forEach((conf, watcher) -> {
if (!conf.getClass().isAnnotationPresent(NoConfigScreen.class)) {
AbstractConfig config = watcher.getLeft();
ModList.get().getModContainerById(config.getModId()).ifPresent(c -> c.registerExtensionPoint(IConfigScreenFactory.class, ((minecraft, screen) -> new CraterConfigScreen(config, screen))));
AbstractConfig config = watcher.getLeft();
if (config.getClass().isAnnotationPresent(NoConfigScreen.class))
return;
if (watcher.getLeft().getClass().isAnnotationPresent(ClothScreen.class) && (ModloaderEnvironment.INSTANCE.isModLoaded("cloth_config") || ModloaderEnvironment.INSTANCE.isModLoaded("cloth-config") || ModloaderEnvironment.INSTANCE.isModLoaded("clothconfig"))) {
ModList.get().getModContainerById(config.getModId()).ifPresent(c -> c.registerExtensionPoint(IConfigScreenFactory.class, ((minecraft, screen) -> ClothConfigScreenBuilder.buildConfigScreen(config, screen))));
} else {
//ModList.get().getModContainerById(config.getModId()).ifPresent(c -> c.registerExtensionPoint(IConfigScreenFactory.class, ((minecraft, screen) -> new CraterConfigScreen(config, screen))));
}
});
}