Merge branch '1.8-dev' into 1.8.9-dev

This commit is contained in:
Jonas Herzig
2018-01-16 21:52:50 +01:00
37 changed files with 758 additions and 43 deletions

View File

@@ -22,6 +22,7 @@ import java.util.List;
version = "@MOD_VERSION@",
acceptedMinecraftVersions = "@MC_VERSION@",
acceptableRemoteVersions = "*",
clientSideOnly = true,
useMetadata = true)
public class ReplayModRender {
public static final String MOD_ID = "replaymod-render";

View File

@@ -427,7 +427,7 @@ public class GuiRenderSettings extends GuiScreen implements Closeable {
);
}
private File generateOutputFile(RenderSettings.EncodingPreset encodingPreset) {
protected File generateOutputFile(RenderSettings.EncodingPreset encodingPreset) {
String fileName = new SimpleDateFormat("yyyy_MM_dd_HH_mm_ss").format(new Date());
File folder = ReplayModRender.instance.getVideoFolder();
return new File(folder, fileName + "." + encodingPreset.getFileExtension());
@@ -447,7 +447,7 @@ public class GuiRenderSettings extends GuiScreen implements Closeable {
config.save();
}
private Property getConfigProperty(Configuration configuration) {
protected Property getConfigProperty(Configuration configuration) {
return configuration.get("rendersettings", "settings", "{}",
"Last state of the render settings GUI. Internal use only.");
}

View File

@@ -37,6 +37,7 @@ public abstract class MixinRenderGlobal {
do {
setupTerrain(viewEntity, partialTicks, camera, replayModRender_hook.nextFrameId(), playerSpectator);
replayModRender_hook.updateChunks();
} while (displayListEntitiesDirty);
displayListEntitiesDirty = true;