Skip to content
Merged

26.1 #74

Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 5 additions & 8 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -1,25 +1,22 @@
name: Build
on:
push:
branches:
- main
- dev
pull_request:
workflow_dispatch:

jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: gradle/actions/wrapper-validation@v4
- uses: actions/setup-java@v4
- uses: actions/checkout@v6
- uses: gradle/actions/wrapper-validation@v6
- uses: actions/setup-java@v5
with:
java-version: '21'
java-version: '25'
distribution: 'microsoft'
- run: chmod +x ./gradlew
- run: ./gradlew build
- uses: actions/upload-artifact@v4
- uses: actions/upload-artifact@v7
with:
name: Artifacts
path: build/libs/
14 changes: 5 additions & 9 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,13 +1,9 @@
## Snapper 1.1.1
## Snapper 1.1.2

### Features
- 1.21.10 support
- Switch to Greenhouse Config
- Add German translations
- Replaced last of the overlays with toasts
- 26.1 support
- Parallel image loading (much faster!)
- Reload Button

### Bug Fixes
- Scrollbar math is now correct
- Fixed hell mode
- Fixed a few weird things with platform detection
- We fixed so many bugs that I cannot list them all
- Many many bugfixes related to reloading
58 changes: 30 additions & 28 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,7 @@ plugins {
alias(libs.plugins.modpublish)
}

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

val modVersion = "1.1.1"
val modVersion = "1.1.2"
val modId = "snapper"
val modName = "Snapper"

Expand All @@ -21,11 +19,6 @@ version = "$modVersion+${libs.versions.minecraft.get()}"

@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") }
Expand All @@ -49,6 +42,22 @@ repositories {
mavenCentral()
}

val debugArgs = listOf(
"-enableassertions",

// Mixin debugging, should make failures happen quicker
"-Dmixin.debug.verify=true",
"-Dmixin.debug.strict=true",
"-Dmixin.debug.countInjections=true",

// Memory Usage Optimization
"-XX:+UseZGC",
"-XX:+UseCompactObjectHeaders",
"-XX:+UseStringDeduplication",

"-XX:+AlwaysPreTouch" // Apparently makes startup faster
)

loom {
runtimeOnlyLog4j = true

Expand All @@ -60,29 +69,22 @@ loom {
}

accessWidenerPath = file("src/main/resources/snapper.classtweaker")

runs.configureEach { jvmArguments.addAll(debugArgs) }
}

dependencies {
minecraft(libs.minecraft)
@Suppress("UnstableApiUsage")
mappings(
loom.layered {
officialMojangMappings()
parchment(libs.parchment)
}
)

modImplementation(libs.fabric.loader)
modImplementation(libs.fabric.api)
implementation(libs.fabric.loader)
implementation(libs.fabric.api)

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

modRuntimeOnly(libs.greenhouse.config)
include(libs.greenhouse.config)
runtimeOnly(libs.greenhouse.config.fabric)
include(libs.greenhouse.config.fabric)

modCompileOnly(libs.modmenu)
compileOnly(libs.modmenu)

implementation(libs.objc.bridge)
}
Expand All @@ -101,21 +103,21 @@ tasks.processResources {
java {
withSourcesJar()

sourceCompatibility = JavaVersion.VERSION_21
targetCompatibility = JavaVersion.VERSION_21
sourceCompatibility = JavaVersion.VERSION_25
targetCompatibility = JavaVersion.VERSION_25
}

tasks.withType<JavaCompile> {
options.encoding = "UTF-8"
options.release = 21
options.release = 25
}

tasks.jar {
from("LICENSE") { rename { "${it}_$modId" } }
}

publishMods {
file = tasks.remapJar.get().archiveFile
file = tasks.jar.get().archiveFile
modLoaders.add("fabric")

version = modVersion
Expand All @@ -126,7 +128,7 @@ publishMods {

modrinth {
accessToken = providers.gradleProperty("secrets.modrinth_token")
projectId = modrinthProject
projectId = "MZQyESDC"
minecraftVersions.add(libs.versions.minecraft.get())

projectDescription = providers.fileContents(layout.projectDirectory.file("README.md")).asText
Expand Down
20 changes: 9 additions & 11 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,31 +1,29 @@
[versions]
fabric_loom = "1.15-SNAPSHOT"
modpublish = "1.1.0"
fabric_loom = "1.17-SNAPSHOT"
modpublish = "2.0.0"

minecraft = "1.21.10"
parchment = "2025.10.12"
minecraft = "26.1.2"

fabric_loader = "0.18.1"
fabric_api = "0.138.3+1.21.10"
fabric_loader = "0.18.4"
fabric_api = "0.151.0+26.1.2"

greenhouse_config = "3.0.0-beta.4+1.21.10"
modmenu = "16.0.0"
greenhouse_config = "3.0.0-beta.5+26.1.x"
modmenu = "18.0.0-beta.1"

objc_bridge = "1.0.0"

[plugins]
fabric_loom = { id = "net.fabricmc.fabric-loom-remap", version.ref = "fabric_loom" }
fabric_loom = { id = "net.fabricmc.fabric-loom", version.ref = "fabric_loom" }
modpublish = { id = "me.modmuss50.mod-publish-plugin", version.ref = "modpublish" }

[libraries]
minecraft = { group = "mojang", name = "minecraft", version.ref = "minecraft" }
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" }

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" }
greenhouse_config_fabric = { group = "lgbt.greenhouse.config", name = "greenhouse-config-fabric", version.ref = "greenhouse_config" }

modmenu = { group = "com.terraformersmc", name = "modmenu", version.ref = "modmenu" }

Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
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-9.2.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.0-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
7 changes: 2 additions & 5 deletions gradlew

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions gradlew.bat

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 7 additions & 5 deletions src/client/java/dev/spiritstudios/snapper/Snapper.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,24 @@
import dev.spiritstudios.snapper.util.uploading.ScreenshotUploading;
import net.fabricmc.api.ClientModInitializer;
import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientLifecycleEvents;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.resources.Identifier;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

public final class Snapper implements ClientModInitializer {
public static final String MOD_ID = "snapper";
public static final Logger LOGGER = LoggerFactory.getLogger(MOD_ID);

public static final ScopedValue<Identifier> CUBEMAP_TEXTURE = ScopedValue.newInstance();

@Override
public void onInitializeClient() {
SnapperConfig.init();
SnapperKeybindings.init();
ClientLifecycleEvents.CLIENT_STOPPING.register(client -> ScreenshotUploading.close());
SnapperKeyMappings.init();
ClientLifecycleEvents.CLIENT_STOPPING.register(_ -> ScreenshotUploading.close());
}

public static ResourceLocation id(String path) {
return ResourceLocation.fromNamespaceAndPath(MOD_ID, path);
public static Identifier id(String path) {
return Identifier.fromNamespaceAndPath(MOD_ID, path);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
import lgbt.greenhouse.config.api.v3.dfu.fix.GreenhouseConfigRelocateFieldsFix;
import lgbt.greenhouse.config.api.v3.lang.GreenhouseConfigJsonCLang;
import lgbt.greenhouse.config.api.v3.lang.GreenhouseConfigJsonLang;
import net.minecraft.Util;
import net.minecraft.util.Util;

import java.nio.file.Path;
import java.util.concurrent.CompletableFuture;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import dev.spiritstudios.snapper.util.ScreenshotTexture;
import dev.spiritstudios.snapper.util.ScreenshotActions;
import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper;
import net.fabricmc.fabric.api.client.keymapping.v1.KeyMappingHelper;
import net.minecraft.client.KeyMapping;
import net.minecraft.client.Minecraft;
import net.minecraft.network.chat.Component;
Expand All @@ -15,35 +15,35 @@
import java.nio.file.Path;
import java.util.List;

public final class SnapperKeybindings {
public static final KeyMapping.Category SNAPPER = KeyMapping.Category.register(Snapper.id(Snapper.MOD_ID));
public final class SnapperKeyMappings {
public static final KeyMapping.Category SNAPPER_CATEGORY = KeyMapping.Category.register(Snapper.id(Snapper.MOD_ID));

public static final KeyMapping PANORAMA_KEY = new KeyMapping(
"key.snapper.panorama",
GLFW.GLFW_KEY_F8,
SNAPPER
SNAPPER_CATEGORY
);

public static final KeyMapping RECENT_SCREENSHOT_KEY = new KeyMapping(
"key.snapper.recent",
GLFW.GLFW_KEY_O,
SNAPPER
SNAPPER_CATEGORY
);

public static final KeyMapping SCREENSHOT_MENU_KEY = new KeyMapping(
"key.snapper.screenshot_menu",
GLFW.GLFW_KEY_V,
SNAPPER
SNAPPER_CATEGORY
);

public static void init() {
KeyBindingHelper.registerKeyBinding(PANORAMA_KEY);
KeyBindingHelper.registerKeyBinding(RECENT_SCREENSHOT_KEY);
KeyBindingHelper.registerKeyBinding(SCREENSHOT_MENU_KEY);
KeyMappingHelper.registerKeyMapping(PANORAMA_KEY);
KeyMappingHelper.registerKeyMapping(RECENT_SCREENSHOT_KEY);
KeyMappingHelper.registerKeyMapping(SCREENSHOT_MENU_KEY);

ClientTickEvents.END_CLIENT_TICK.register(client -> {
while (PANORAMA_KEY.consumeClick()) SnapperKeybindings.takePanorama(client);
while (RECENT_SCREENSHOT_KEY.consumeClick()) SnapperKeybindings.openRecentScreenshot(client);
while (PANORAMA_KEY.consumeClick()) SnapperKeyMappings.takePanorama(client);
while (RECENT_SCREENSHOT_KEY.consumeClick()) SnapperKeyMappings.openRecentScreenshot(client);
while (SCREENSHOT_MENU_KEY.consumeClick()) client.setScreen(new ScreenshotListScreen(client.screen));
});
}
Expand Down Expand Up @@ -79,17 +79,14 @@ private static void openRecentScreenshot(Minecraft client) {
image -> {
client.setScreen(new ScreenshotViewerScreen(
image,
latestPath,
client.screen
));
image.load();
},
() -> SnapperToast.push(
SnapperToast.Type.DENY,
Component.translatable("toast.snapper.screenshot.recent.failure"),
Component.translatable("toast.snapper.screenshot.recent.failure.generic")
)
);

}
}
Loading