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 17:14:57 +02:00
parent 864baeb6c5
commit 8a46899769
290 changed files with 6213 additions and 459 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
patches/1.20.4/NeoForge/build.gradle.patch
View File

@@ -1,6 +1,6 @@
--- a/NeoForge/build.gradle
+++ b/NeoForge/build.gradle
@@ -35,12 +35,7 @@
@@ -37,12 +37,7 @@
unimined.minecraft {
neoForged {
@@ -14,7 +14,7 @@
mixinConfig("${mod_id}.mixins.json", "${mod_id}.neoforge.mixins.json")
}
}
@@ -59,7 +54,7 @@
@@ -61,7 +56,7 @@
from project(":Common").sourceSets.main.resources
def buildProps = project.properties.clone()
@@ -23,12 +23,12 @@
expand buildProps
}
}
@@ -114,8 +109,8 @@
@@ -116,8 +111,8 @@
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")
+ setDisplayName("[NeoForge 1.20.4] CraterLib - ${project.version}")
+ setGameVersions("1.20.4")
setLoaders("neoforge")

18
patches/1.20.4/NeoForge/src/main/java/com/hypherionmc/craterlib/client/NeoForgeClientHelper.java.patch
View File

@@ -1,15 +1,18 @@
--- a/NeoForge/src/main/java/com/hypherionmc/craterlib/client/NeoForgeClientHelper.java
+++ b/NeoForge/src/main/java/com/hypherionmc/craterlib/client/NeoForgeClientHelper.java
@@ -1,20 +1,11 @@
@@ -1,23 +1,12 @@
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;
@@ -21,7 +24,7 @@
import java.util.Objects;
@@ -45,17 +36,5 @@
@@ -48,22 +37,5 @@
public Connection getClientConnection() {
Objects.requireNonNull(Minecraft.getInstance().getConnection(), "Cannot send packets when not in game!");
return Minecraft.getInstance().getConnection().getConnection();
@@ -32,9 +35,14 @@
- 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))));
- }
- });
}