Snapper 1.1.1 for 1.21.10

build.gradle.kts

@@ -1,92 +1,135 @@
 plugins {
-	java
-	alias(libs.plugins.fabric.loom)
-	alias(libs.plugins.minotaur)
-}
+    java
 
-class ModInfo {
-	val id = property("mod.id").toString()
-	val group = property("mod.group").toString()
-	val version = property("mod.version").toString()
+    alias(libs.plugins.fabric.loom)
+    alias(libs.plugins.modpublish)
 }
 
-val mod = ModInfo()
+val mappingsAttribute = Attribute.of("net.minecraft.mappings", String::class.java)!!
 
-version = "${mod.version}+${libs.versions.minecraft.get()}"
-group = mod.group
+val modVersion = "1.1.1"
+val modId = "snapper"
+val modName = "Snapper"
 
-base.archivesName = mod.id
+val modrinthProject = "snapper"
+val githubRepository = "SpiritGameStudios/Snapper"
 
-loom {
-	splitEnvironmentSourceSets()
+group = "dev.spiritstudios"
+base.archivesName = modId
 
-	mods.create(mod.id) {
-		sourceSet(sourceSets["main"])
-		sourceSet(sourceSets["client"])
-	}
+version = "$modVersion+${libs.versions.minecraft.get()}"
 
-	accessWidenerPath = file("src/main/resources/snapper.accesswidener")
+@Suppress("UnstableApiUsage")
+repositories {
+    maven("https://maven.parchmentmc.org/") {
+        name = "ParchmentMC"
+        content { includeGroupAndSubgroups("org.parchmentmc") }
+    }
+
+    maven("https://maven.terraformersmc.com/") {
+        name = "Terraformers"
+        content { includeGroupAndSubgroups("com.terraformersmc") }
+    }
+
+    maven("https://moehreag.duckdns.org/maven/releases/") {
+        name = "AxolotlClient Releases"
+        content { includeGroupAndSubgroups("io.github.axolotlclient") }
+    }
+
+    maven("https://maven.greenhouse.lgbt/releases/") {
+        name = "Greenhouse Releases"
+        content { includeGroupAndSubgroups("lgbt.greenhouse") }
+    }
+
+    maven("https://maven.greenhouse.lgbt/snapshots/") {
+        name = "Greenhouse Snapshots"
+        content { includeGroupAndSubgroups("lgbt.greenhouse") }
+    }
+
+    mavenCentral()
 }
 
-repositories {
-	mavenCentral()
-	maven("https://maven.spiritstudios.dev/releases/")
-	maven("https://moehreag.duckdns.org/maven/releases") {
-		content {
-			includeGroup("io.github.axolotlclient.AxolotlClient")
-			includeGroup("io.github.axolotlclient.AxolotlClient-config")
-		}
-	}
+loom {
+    runtimeOnlyLog4j = true
+
+    splitEnvironmentSourceSets()
+
+    mods.create(modId) {
+        sourceSet(sourceSets["main"])
+        sourceSet(sourceSets["client"])
+    }
+
+    accessWidenerPath = file("src/main/resources/snapper.classtweaker")
 }
 
 dependencies {
-	minecraft(libs.minecraft)
-	mappings(variantOf(libs.yarn) { classifier("v2") })
-	modImplementation(libs.fabric.loader)
+    minecraft(libs.minecraft)
+    @Suppress("UnstableApiUsage")
+    mappings(
+        loom.layered {
+            officialMojangMappings()
+            parchment(libs.parchment)
+        }
+    )
+
+    modImplementation(libs.fabric.loader)
+    modImplementation(libs.fabric.api)
+
+    modCompileOnlyApi(libs.greenhouse.config.api) {
+        attributes { attribute(mappingsAttribute, "intermediary") }
+    }
 
-	modImplementation(libs.fabric.api)
+    modRuntimeOnly(libs.greenhouse.config)
+    include(libs.greenhouse.config)
 
-	include(libs.bundles.specter)
-	modImplementation(libs.bundles.specter)
+    modCompileOnly(libs.modmenu)
 
-	implementation(libs.objc.bridge)
+    implementation(libs.objc.bridge)
 }
 
 tasks.processResources {
-	val map = mapOf(
-		"mod_id" to mod.id,
-		"mod_version" to mod.version,
-		"fabric_loader_version" to libs.versions.fabric.loader.get(),
-		"minecraft_version" to libs.versions.minecraft.get()
-	)
-
-	inputs.properties(map)
-	filesMatching("fabric.mod.json") { expand(map) }
+    val map = mapOf(
+        "version" to modVersion,
+        "loader_version" to libs.versions.fabric.loader.get()
+    )
+
+    inputs.properties(map)
+
+    filesMatching("fabric.mod.json") { expand(map) }
 }
 
 java {
-	withSourcesJar()
+    withSourcesJar()
 
-	sourceCompatibility = JavaVersion.VERSION_21
-	targetCompatibility = JavaVersion.VERSION_21
+    sourceCompatibility = JavaVersion.VERSION_21
+    targetCompatibility = JavaVersion.VERSION_21
 }
 
 tasks.withType<JavaCompile> {
-	options.encoding = "UTF-8"
-	options.release = 21
+    options.encoding = "UTF-8"
+    options.release = 21
 }
 
-tasks.jar { from("LICENSE") { rename { "${it}_${base.archivesName.get()}" } } }
-
-modrinth {
-	token.set(System.getenv("MODRINTH_TOKEN"))
-	projectId.set(mod.id)
-	versionNumber.set(mod.version)
-	uploadFile.set(tasks.remapJar)
-	gameVersions.addAll(libs.versions.minecraft.get(), "1.21.8")
-	loaders.addAll("fabric", "quilt")
-	syncBodyFrom.set(rootProject.file("README.md").readText())
-	dependencies {
-		required.version("fabric-api", libs.versions.fabric.api.get())
-	}
-}
+tasks.jar {
+    from("LICENSE") { rename { "${it}_$modId" } }
+}
+
+publishMods {
+    file = tasks.remapJar.get().archiveFile
+    modLoaders.add("fabric")
+
+    version = modVersion
+    type = STABLE
+    displayName = "$modName $modVersion for Minecraft ${libs.versions.minecraft.get()}"
+
+    modrinth {
+        accessToken = providers.gradleProperty("secrets.modrinth_token")
+        projectId = modrinthProject
+        minecraftVersions.add(libs.versions.minecraft.get())
+
+        projectDescription = providers.fileContents(layout.projectDirectory.file("README.md")).asText
+
+        requires("fabric-api")
+        embeds("greenhouse-config")
+    }
+}

gradle.properties

@@ -1,6 +1,6 @@
-org.gradle.jvmargs=-Xmx2G
+org.gradle.jvmargs=-Xmx1G
 org.gradle.parallel=true
 
-mod.version = 1.1
-mod.group = dev.spiritstudios
-mod.id = snapper
+# IntelliJ IDEA is not yet fully compatible with configuration cache, see: https://github.com/FabricMC/fabric-loom/issues/1349
+# If you really want to use this, it may work on some tasks if you set "Shorten command line" in your InteliJ run configuration to "none".
+org.gradle.configuration-cache=false

gradle/libs.versions.toml

@@ -1,38 +1,32 @@
 [versions]
-fabric_loom = "1.11-SNAPSHOT"
-minotaur = "2.+"
+fabric_loom = "1.15-SNAPSHOT"
+modpublish = "1.1.0"
 
-minecraft = "1.21.8"
-yarn = "1.21.8+build.1"
+minecraft = "1.21.10"
+parchment = "2025.10.12"
 
-fabric_loader = "0.17.2"
-fabric_api = "0.133.4+1.21.8"
+fabric_loader = "0.18.1"
+fabric_api = "0.138.3+1.21.10"
+
+greenhouse_config = "3.0.0-beta.4+1.21.10"
+modmenu = "16.0.0"
 
-specter = "1.3.0"
 objc_bridge = "1.0.0"
 
 [plugins]
-fabric_loom = { id = "fabric-loom", version.ref = "fabric_loom" }
-minotaur = { id = "com.modrinth.minotaur", version.ref = "minotaur" }
+fabric_loom = { id = "net.fabricmc.fabric-loom-remap", version.ref = "fabric_loom" }
+modpublish = { id = "me.modmuss50.mod-publish-plugin", version.ref = "modpublish" }
 
 [libraries]
 minecraft = { group = "mojang", name = "minecraft", version.ref = "minecraft" }
-yarn = { group = "net.fabricmc", name = "yarn", version.ref = "yarn" }
+parchment = { group = "org.parchmentmc.data", name = "parchment-1.21.10", version.ref = "parchment" }
 
 fabric_loader = { group = "net.fabricmc", name = "fabric-loader", version.ref = "fabric_loader" }
 fabric_api = { group = "net.fabricmc.fabric-api", name = "fabric-api", version.ref = "fabric_api" }
 
-specter_config = { group = "dev.spiritstudios.specter", name = "config", version.ref = "specter" }
-specter_core = { group = "dev.spiritstudios.specter", name = "core", version.ref = "specter" }
-specter_serialization = { group = "dev.spiritstudios.specter", name = "serialization", version.ref = "specter" }
-specter_gui = { group = "dev.spiritstudios.specter", name = "gui", version.ref = "specter" }
+greenhouse_config_api = { group = "lgbt.greenhouse.config", name = "greenhouse-config-api", version.ref = "greenhouse_config" }
+greenhouse_config = { group = "lgbt.greenhouse.config", name = "greenhouse-config-fabric", version.ref = "greenhouse_config" }
 
-objc_bridge = { group = "ca.weblite", name = "java-objc-bridge", version.ref = "objc_bridge" }
+modmenu = { group = "com.terraformersmc", name = "modmenu", version.ref = "modmenu" }
 
-[bundles]
-specter = [
-    "specter_serialization",
-    "specter_core",
-    "specter_config",
-    "specter_gui"
-]
+objc_bridge = { group = "ca.weblite", name = "java-objc-bridge", version.ref = "objc_bridge" }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

src/client/java/dev/spiritstudios/snapper/Snapper.java

@@ -1,40 +1,24 @@
 package dev.spiritstudios.snapper;
 
-import dev.spiritstudios.snapper.util.PlatformHelper;
-import dev.spiritstudios.snapper.util.actions.GeneralPlatformActions;
-import dev.spiritstudios.snapper.util.actions.MacPlatformActions;
-import dev.spiritstudios.snapper.util.config.DirectoryConfigUtil;
 import dev.spiritstudios.snapper.util.uploading.ScreenshotUploading;
-import dev.spiritstudios.specter.api.config.client.ConfigScreenWidgets;
-import dev.spiritstudios.specter.api.config.client.ModMenuHelper;
 import net.fabricmc.api.ClientModInitializer;
 import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientLifecycleEvents;
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.util.Identifier;
+import net.minecraft.resources.ResourceLocation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.nio.file.Path;
-
 public final class Snapper implements ClientModInitializer {
-    public static final String MODID = "snapper";
-    public static final Logger LOGGER = LoggerFactory.getLogger(MODID);
+    public static final String MOD_ID = "snapper";
+    public static final Logger LOGGER = LoggerFactory.getLogger(MOD_ID);
 
     @Override
     public void onInitializeClient() {
-        ConfigScreenWidgets.add(Path.class, DirectoryConfigUtil.PATH_WIDGET_FACTORY);
+        SnapperConfig.init();
         SnapperKeybindings.init();
-
-        ModMenuHelper.addConfig(Snapper.MODID, SnapperConfig.HOLDER.id());
-
         ClientLifecycleEvents.CLIENT_STOPPING.register(client -> ScreenshotUploading.close());
     }
 
-    public static Identifier id(String path) {
-        return Identifier.of(MODID, path);
-    }
-
-    public static PlatformHelper getPlatformHelper() {
-        return MinecraftClient.IS_SYSTEM_MAC ? new MacPlatformActions() : new GeneralPlatformActions();
+    public static ResourceLocation id(String path) {
+        return ResourceLocation.fromNamespaceAndPath(MOD_ID, path);
     }
 }