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

7
Fabric/build.gradle
View File

@@ -12,6 +12,7 @@ dependencies {
stupidRemapArch("dev.ftb.mods:ftb-essentials:${ftb_essentials}")
stupidRemapArch("dev.ftb.mods:ftb-ranks:${ftb_ranks}")
modImplementation("me.shedaniel.cloth:cloth-config-fabric:${cloth_config}")
modImplementation "maven.modrinth:fabrictailor:${fabrictailor}"
modImplementation "maven.modrinth:vanish:${vanish}"
@@ -116,8 +117,8 @@ publisher {
setVersionType("release")
setChangelog(rootProject.file("changelog.md"))
setProjectVersion("${minecraft_version}-${project.version}")
setDisplayName("[FABRIC/QUILT 1.21.3] CraterLib - ${project.version}")
setGameVersions("1.21.3")
setDisplayName("[FABRIC/QUILT 1.21.3/4] CraterLib - ${project.version}")
setGameVersions("1.21.3", "1.21.4")
setLoaders("fabric", "quilt")
setArtifact(remapJar)
setCurseEnvironment("both")
@@ -125,9 +126,11 @@ publisher {
modrinthDepends {
required("fabric-api")
optional("cloth-config", "modmenu")
}
curseDepends {
required("fabric-api")
optional("cloth-config", "modmenu")
}
}

14
Fabric/src/main/java/com/hypherionmc/craterlib/CraterLibModMenuIntegration.java
View File

@@ -1,8 +1,12 @@
package com.hypherionmc.craterlib;
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.platform.ModloaderEnvironment;
import com.terraformersmc.modmenu.api.ConfigScreenFactory;
import com.terraformersmc.modmenu.api.ModMenuApi;
@@ -19,8 +23,14 @@ public class CraterLibModMenuIntegration implements ModMenuApi {
Map<String, ConfigScreenFactory<?>> configScreens = new HashMap<>();
ConfigController.getWatchedConfigs().forEach((conf, watcher) -> {
if (!conf.getClass().isAnnotationPresent(NoConfigScreen.class)) {
configScreens.put(watcher.getLeft().getModId(), screen -> new CraterConfigScreen(watcher.getLeft(), 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"))) {
configScreens.put(config.getModId(), screen -> ClothConfigScreenBuilder.buildConfigScreen(config, screen));
} else {
//configScreens.put(config.getModId(), screen -> new CraterConfigScreen(config, screen));
}
});