Prepare for 1.0.1

Up-Mods · Dec 23, 2024 · eb3c43b · eb3c43b
1 parent 43859eb
commit eb3c43b
Show file tree

Hide file tree

Showing 7 changed files with 39 additions and 3 deletions.
diff --git a/buildSrc/src/main/kotlin/mod_conventions_common.gradle.kts b/buildSrc/src/main/kotlin/mod_conventions_common.gradle.kts
@@ -42,8 +42,8 @@ publishing {
 			maven {
 				url = uri(uploadUrl)
 				credentials {
-					System.getenv("MAVEN_UPLOAD_USERNAME")
-					System.getenv("MAVEN_UPLOAD_PASSWORD")
+					username = System.getenv("MAVEN_UPLOAD_USERNAME")
+					password = System.getenv("MAVEN_UPLOAD_PASSWORD")
 				}
 			}
 		}

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -10,13 +10,17 @@ neoforge = "21.4.33-beta"
 
 fabric_api = "0.112.0+1.21.4"
 
+modmenu = "13.0.0-beta.1"
+
 [libraries]
 minecraft = { module = "com.mojang:minecraft", version.ref = "minecraft" }
 parchment = { module = "org.parchmentmc.data:parchment-1.21.3", version.ref = "parchment" }
 fabric_loader = { module = "net.fabricmc:fabric-loader", version.ref = "fabric_loader" }
 
 fabric_api = { module = "net.fabricmc.fabric-api:fabric-api", version.ref = "fabric_api" }
 
+modmenu = { module = "com.terraformersmc:modmenu", version.ref = "modmenu" }
+
 # If you have multiple similar dependencies, you can declare a dependency bundle and reference it on the build script with "libs.bundles.example".
 [bundles]
 

diff --git a/mod_common/src/main/java/io/github/ennuil/crooked_crooks/satire_config/SatireConfig.java b/mod_common/src/main/java/io/github/ennuil/crooked_crooks/satire_config/SatireConfig.java
@@ -1,6 +1,8 @@
 package io.github.ennuil.crooked_crooks.satire_config;
 
 import com.mojang.logging.LogUtils;
+import net.minecraft.Util;
+import net.minecraft.client.gui.screens.Screen;
 import org.jetbrains.annotations.NotNull;
 import org.slf4j.Logger;
 
@@ -104,7 +106,16 @@ public static ModConfig getConfig() {
 		return SatireConfig.config;
 	}
 
+	public static Path getConfigPath() {
+		return SatireConfig.configPath.get();
+	}
+
 	public static void setConfigPath(Path path) {
 		SatireConfig.configPath = () -> path;
 	}
+
+	public static Screen wrapConfigScreen(Screen screen) {
+		Util.getPlatform().openPath(SatireConfig.getConfigPath());
+		return screen;
+	}
 }
diff --git a/mod_fabric/build.gradle.kts b/mod_fabric/build.gradle.kts
@@ -5,6 +5,10 @@ plugins {
 
 base.archivesName = "crooked_crooks-fabric"
 
+repositories {
+	maven("https://maven.terraformersmc.com/releases")
+}
+
 dependencies {
 	minecraft(libs.minecraft)
 
@@ -15,6 +19,8 @@ dependencies {
 	modImplementation(libs.fabric.loader)
 
 	modImplementation(libs.fabric.api)
+
+	modImplementation(libs.modmenu)
 }
 
 loom {

diff --git a/...fabric/src/main/java/io/github/ennuil/crooked_crooks/compat/modmenu/ModModMenuCompat.java b/...fabric/src/main/java/io/github/ennuil/crooked_crooks/compat/modmenu/ModModMenuCompat.java
@@ -0,0 +1,12 @@
+package io.github.ennuil.crooked_crooks.compat.modmenu;
+
+import com.terraformersmc.modmenu.api.ConfigScreenFactory;
+import com.terraformersmc.modmenu.api.ModMenuApi;
+import io.github.ennuil.crooked_crooks.satire_config.SatireConfig;
+
+public class ModModMenuCompat implements ModMenuApi {
+	@Override
+	public ConfigScreenFactory<?> getModConfigScreenFactory() {
+		return SatireConfig::wrapConfigScreen;
+	}
+}
diff --git a/mod_fabric/src/main/resources/fabric.mod.json b/mod_fabric/src/main/resources/fabric.mod.json
@@ -16,7 +16,8 @@
 	"environment": "*",
 	"entrypoints": {
 		"main": ["io.github.ennuil.crooked_crooks.ModInit"],
-		"fabric-datagen": ["io.github.ennuil.crooked_crooks.datagen.ModDatagenInit"]
+		"fabric-datagen": ["io.github.ennuil.crooked_crooks.datagen.ModDatagenInit"],
+		"modmenu": ["io.github.ennuil.crooked_crooks.compat.modmenu.ModModMenuCompat"]
 	},
 	"mixins": [
 		"crooked_crooks.mixins.json",

diff --git a/mod_norge/src/main/java/io/github/ennuil/crooked_crooks/ModInit.java b/mod_norge/src/main/java/io/github/ennuil/crooked_crooks/ModInit.java
@@ -9,12 +9,14 @@
 import net.neoforged.fml.ModContainer;
 import net.neoforged.fml.common.Mod;
 import net.neoforged.fml.loading.FMLPaths;
+import net.neoforged.neoforge.client.gui.IConfigScreenFactory;
 
 @Mod(ModUtils.MOD_NAMESPACE)
 public class ModInit {
 	public ModInit(IEventBus bus, ModContainer mod) {
 		SatireConfig.setConfigPath(FMLPaths.CONFIGDIR.get().resolve("crooked_crooks"));
 		SatireConfig.init();
+		mod.registerExtensionPoint(IConfigScreenFactory.class, (mod2, screen) -> SatireConfig.wrapConfigScreen(screen));
 		ModItems.ITEMS.register(bus);
 		ModAttributes.ATTRIBUTES.register(bus);
 		ModMobEffects.MOB_EFFECTS.register(bus);