Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 18 additions & 2 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ plugins {
alias(libs.plugins.minotaur)
}

val mappingsAttribute = Attribute.of("net.minecraft.mappings", String::class.java)!!

class ModInfo {
val id = property("mod.id").toString()
val group = property("mod.group").toString()
Expand All @@ -30,25 +32,39 @@ loom {

repositories {
mavenCentral()
maven("https://maven.parchmentmc.org/")
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")
}
}
maven("https://maven.greenhouse.lgbt/releases/")
maven("https://maven.greenhouse.lgbt/snapshots/")
}

dependencies {
minecraft(libs.minecraft)
mappings(variantOf(libs.yarn) { classifier("v2") })
mappings(loom.layered {
officialMojangMappings()
parchment(libs.parchment)
})
modImplementation(libs.fabric.loader)

modImplementation(libs.fabric.api)

include(libs.bundles.specter)
modImplementation(libs.bundles.specter)

modCompileOnlyApi(libs.greenhouse.config.api) {
attributes {
attribute(mappingsAttribute, "intermediary")
}
}
modRuntimeOnly(libs.greenhouse.config)
include(libs.greenhouse.config)

implementation(libs.objc.bridge)
}

Expand Down Expand Up @@ -89,4 +105,4 @@ modrinth {
dependencies {
required.version("fabric-api", libs.versions.fabric.api.get())
}
}
}
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
org.gradle.jvmargs=-Xmx2G
org.gradle.parallel=true

mod.version = 1.1
mod.version = 1.1.1
mod.group = dev.spiritstudios
mod.id = snapper
18 changes: 9 additions & 9 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,38 +1,38 @@
[versions]
fabric_loom = "1.13-SNAPSHOT"
fabric_loom = "1.14-SNAPSHOT"
minotaur = "2.+"

minecraft = "1.21.10"
yarn = "1.21.10+build.2"
parchment = "2025.10.12"

fabric_loader = "0.17.3"
fabric_api = "0.138.3+1.21.10"

specter = "1.3.2"
greenhouse_config = "3.0.0-beta.1+1.21.10"
objc_bridge = "1.0.0"

[plugins]
fabric_loom = { id = "fabric-loom", version.ref = "fabric_loom" }
fabric_loom = { id = "net.fabricmc.fabric-loom-remap", version.ref = "fabric_loom" }
minotaur = { id = "com.modrinth.minotaur", version.ref = "minotaur" }

[libraries]
minecraft = { group = "mojang", name = "minecraft", version.ref = "minecraft" }
yarn = { group = "net.fabricmc", name = "yarn", version.ref = "yarn" }
parchment = { module = "org.parchmentmc.data: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" }

[bundles]
specter = [
"specter_serialization",
"specter_core",
"specter_config",
"specter_gui"
]
]
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
Expand Down
15 changes: 4 additions & 11 deletions src/client/java/dev/spiritstudios/snapper/Snapper.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,13 @@
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.util.Identifier;
import net.minecraft.resources.ResourceLocation;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import java.nio.file.Path;
import java.util.Locale;

public final class Snapper implements ClientModInitializer {
Expand All @@ -23,16 +19,13 @@ public final class Snapper implements ClientModInitializer {

@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 ResourceLocation id(String path) {
return ResourceLocation.fromNamespaceAndPath(MODID, path);
}

public static PlatformHelper getPlatformHelper() {
Expand Down
Loading