Catalogue integration

fabric/build.gradle

@@ -49,6 +49,9 @@ dependencies {
 	//modRuntimeOnly "curse.maven:structureessentialsforgefabric-832882:4429721"
 	//modRuntimeOnly("me.djtheredstoner:DevAuth-fabric:1.1.2")
 
+	// Optional dependency catalogue
+	modRuntimeOnly "curse.maven:catalogue-fabric-667377:4171029"
+
 	common(project(path: ":common", configuration: "namedElements")) { transitive false }
 	shadowCommon(project(path: ":common", configuration: "transformProductionFabric")) { transitive false }
 }

fabric/src/main/java/com/faboslav/friendsandfoes/integrations/fabric/CatalogueIntegration.java

@@ -0,0 +1,18 @@
+package com.faboslav.friendsandfoes.integrations.fabric;
+
+import com.faboslav.friendsandfoes.FriendsAndFoes;
+import com.faboslav.friendsandfoes.config.ConfigScreenBuilder;
+import net.fabricmc.loader.api.FabricLoader;
+import net.fabricmc.loader.api.ModContainer;
+import net.minecraft.client.gui.screen.Screen;
+
+public class CatalogueIntegration
+{
+	public static Screen createConfigScreen(Screen currentScreen, ModContainer container) {
+		if (FabricLoader.getInstance().isModLoaded("catalogue") == false) {
+			return null;
+		}
+
+		return ConfigScreenBuilder.createConfigScreen(FriendsAndFoes.getConfig(), currentScreen);
+	}
+}

fabric/src/main/resources/fabric.mod.json

@@ -14,7 +14,7 @@
 		"wiki": "https://github.com/Faboslav/friends-and-foes/wiki"
 	},
 	"license": "CC-BY-NC-ND-4.0",
-	"icon": "icon.jpg",
+	"icon": "icon.png",
 	"environment": "*",
 	"entrypoints": {
 		"main": [
@@ -23,9 +23,6 @@
 		"client": [
 			"com.faboslav.friendsandfoes.fabric.FriendsAndFoesFabricClient"
 		],
-		"server": [
-			"com.faboslav.friendsandfoes.fabric.FriendsAndFoesFabricServer"
-		],
 		"preLaunch": [
 			"com.llamalad7.mixinextras.MixinExtrasBootstrap::init"
 		],
@@ -46,9 +43,20 @@
 	"custom": {
 		"modmenu": {
 			"links": {
+				"modmenu.discord": "https://discord.com/invite/QGwFvvMQCn",
 				"Discord": "https://discord.com/invite/QGwFvvMQCn",
-				"Wiki": "https://github.com/Faboslav/friends-and-foes/wiki"
+				"Wiki": "https://github.com/Faboslav/friends-and-foes/wiki",
+				"CurseForge": "https://www.curseforge.com/minecraft/mc-mods/friends-and-foes",
+				"Modrinth": "https://modrinth.com/mod/friends-and-foes"
 			}
+		},
+		"catalogue": {
+			"configFactory": "com.faboslav.friendsandfoes.integrations.fabric.CatalogueIntegration",
+			"icon": {
+				"image": "catalogue_icon.png"
+			},
+			"banner": "catalogue_logo.png",
+			"background": "catalogue_background.png"
 		}
 	}
 }

forge/build.gradle

@@ -45,6 +45,9 @@ dependencies {
 
 	// Cloth config
 	modImplementation("me.shedaniel.cloth:cloth-config-forge:${rootProject.cloth_config_version}")
+
+	// Optional dependency catalogue
+	modRuntimeOnly "curse.maven:catalogue-459701:4171024"
 }
 
 processResources {
@@ -95,6 +98,10 @@ repositories {
 	maven {
 		url = "https://maven.theillusivec4.top/"
 	}
+
+	maven { url "https://www.cursemaven.com" }
+
+	maven { url = "https://pkgs.dev.azure.com/djtheredstoner/DevAuth/_packaging/public/maven/v1" }
 }
 
 publishing {

forge/src/main/resources/META-INF/mods.toml

@@ -9,7 +9,7 @@ version = "${modVersion}"
 displayName = "${modName}"
 authors = "${modAuthor}"
 description = "${modDescription}"
-logoFile = "icon.jpg"
+logoFile = "icon.png"
 
 [[dependencies.friendsandfoes]]
 modId = "forge"
@@ -31,3 +31,8 @@ mandatory = false
 versionRange = "[7,)"
 ordering = "NONE"
 side = "CLIENT"
+
+[modproperties.friendsandfoes]
+catalogueImageIcon="catalogue_icon.png"
+catalogueBackground="catalogue_logo.png"
+configuredBackground="catalogue_background.png"