Merge branch 'stable' into develop

This commit is contained in:
Jonas Herzig
2020-09-27 18:45:05 +02:00
18 changed files with 129 additions and 40 deletions

View File

@@ -97,6 +97,7 @@ public class GuiCreateScreenshot extends GuiRenderSettings implements Loadable {
protected File generateOutputFile(RenderSettings.EncodingPreset encodingPreset) {
DateFormat DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd_HH.mm.ss");
File screenshotFolder = new File(getMinecraft().runDirectory, "screenshots");
screenshotFolder.mkdirs();
String baseName = DATE_FORMAT.format(new Date());
for (int i = 1; ; i++) {
File screenshotFile = new File(screenshotFolder, baseName + (i == 1 ? "" : "_" + i) + ".png");
@@ -106,6 +107,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");