From fb447dc25273b9b1942290fadba90487f7f73f8f Mon Sep 17 00:00:00 2001 From: Jonas Herzig Date: Sun, 27 Sep 2020 13:45:03 +0200 Subject: [PATCH] Fix incorrect extension for custom screenshot file name (fixes #337) --- .../GuiCreateScreenshot.java | 5 ++++ .../com/replaymod/render/RenderSettings.java | 24 +++++++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/src/main/java/com/replaymod/extras/advancedscreenshots/GuiCreateScreenshot.java b/src/main/java/com/replaymod/extras/advancedscreenshots/GuiCreateScreenshot.java index 1e208c2d..71d13f6a 100644 --- a/src/main/java/com/replaymod/extras/advancedscreenshots/GuiCreateScreenshot.java +++ b/src/main/java/com/replaymod/extras/advancedscreenshots/GuiCreateScreenshot.java @@ -95,6 +95,11 @@ public class GuiCreateScreenshot extends GuiRenderSettings implements Loadable { } } + @Override + public void load(RenderSettings settings) { + super.load(settings.withEncodingPreset(RenderSettings.EncodingPreset.PNG)); + } + @Override protected Path getSettingsPath() { return getMinecraft().runDirectory.toPath().resolve("config/replaymod-screenshotsettings.json"); diff --git a/src/main/java/com/replaymod/render/RenderSettings.java b/src/main/java/com/replaymod/render/RenderSettings.java index c39f50b2..f696e862 100644 --- a/src/main/java/com/replaymod/render/RenderSettings.java +++ b/src/main/java/com/replaymod/render/RenderSettings.java @@ -206,6 +206,30 @@ public class RenderSettings { this.highPerformance = highPerformance; } + public RenderSettings withEncodingPreset(EncodingPreset encodingPreset) { + return new RenderSettings( + renderMethod, + encodingPreset, + videoWidth, + videoHeight, + framesPerSecond, + bitRate, + outputFile, + renderNameTags, + stabilizeYaw, + stabilizePitch, + stabilizeRoll, + chromaKeyingColor, + sphericalFovX, + sphericalFovY, + injectSphericalMetadata, + antiAliasing, + exportCommand, + exportArguments, + highPerformance + ); + } + /** * @return the width of the output video during rendering, including the upscale for Anti-Aliasing. */