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

2
patches/1.21.2/.jenkins/Jenkinsfile.snapshot.patch
View File

@@ -3,7 +3,7 @@
@@ -4,7 +4,7 @@
def majorMc = "1.21.2";
def modLoaders = "neoforge|fabric|quilt|paper";
def supportedMc = "1.21.3";
def supportedMc = "1.21.3|1.21.4";
-def reltype = "port";
+def reltype = "snapshot";

12
patches/1.21.2/Forge/build.gradle.patch
View File

@@ -1,6 +1,6 @@
--- a/Forge/build.gradle
+++ /dev/null
@@ -1,116 +1,0 @@
@@ -1,126 +1,0 @@
-// Adjust the output jar name here
-archivesBaseName = "${mod_name.replace(" ", "")}-Forge-${minecraft_version}"
-
@@ -8,6 +8,8 @@
- // Compat
- // NOT AVAILABLE ON FORGE modImplementation("maven.modrinth:vanishmod:${vanishmod}")
-
- modImplementation("me.shedaniel.cloth:cloth-config-forge:${cloth_config}")
-
- // Do not edit or remove
- implementation project(":Common")
-}
@@ -116,4 +118,12 @@
- setArtifact(remapJar)
- setCurseEnvironment("both")
- setIsManualRelease(true)
-
- curseDepends {
- optional("cloth-config")
- }
-
- modrinthDepends {
- optional("cloth-config")
- }
-}

17
patches/1.21.2/Forge/src/main/java/com/hypherionmc/craterlib/mixin/ConfigScreenHandlerMixin.java.patch
View File

@@ -1,6 +1,6 @@
--- a/Forge/src/main/java/com/hypherionmc/craterlib/mixin/ConfigScreenHandlerMixin.java
+++ /dev/null
@@ -1,43 +1,0 @@
@@ -1,44 +1,0 @@
-package com.hypherionmc.craterlib.mixin;
-
-import com.hypherionmc.craterlib.client.gui.config.CraterConfigScreen;
@@ -32,13 +32,14 @@
- @Inject(at = @At("RETURN"), method = "getScreenFactoryFor", cancellable = true, remap = false)
- private static void injectConfigScreen(IModInfo selectedMod, CallbackInfoReturnable<Optional<BiFunction<Minecraft, Screen, Screen>>> cir) {
- ConfigController.getMonitoredConfigs().forEach((conf, watcher) -> {
- if (!conf.getClass().isAnnotationPresent(NoConfigScreen.class)) {
- ModuleConfig config = (ModuleConfig) conf;
- if (config.getModId().equals(selectedMod.getModId())) {
- cir.setReturnValue(
- Optional.of((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))));
- }
- });
- }

2
patches/1.21.2/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 {

2
patches/1.21.2/gradle.properties.patch
View File

@@ -1,6 +1,6 @@
--- a/gradle.properties
+++ b/gradle.properties
@@ -42,7 +42,7 @@
@@ -43,7 +43,7 @@
# Publishing
curse_id=867099
modrinth_id=Nn8Wasaq