DIvan2000/ReplayModCinematic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Wait until world has loaded when previewing a Camera Path

Browse Source 
Clean up unused fields and thus unnecessary methods in ReplayProcess
This commit is contained in:
CrushedPixel
2015-07-17 14:35:58 +02:00
parent 83b91b7d8e
commit 33ff72b878
2 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/eu/crushedpixel/replaymod/events/handlers/TickAndRenderListener.java
View File

@@ -52,7 +52,7 @@ public class TickAndRenderListener {
}); });
} }
if(ReplayHandler.isInPath()) ReplayProcess.unblockAndTick(false); if(ReplayHandler.isInPath()) ReplayProcess.tickReplay(false);
if(ReplayHandler.isCamera()) mc.setRenderViewEntity(ReplayHandler.getCameraEntity()); if(ReplayHandler.isCamera()) mc.setRenderViewEntity(ReplayHandler.getCameraEntity());
if(mc.getRenderViewEntity() != null && (mc.getRenderViewEntity() == mc.thePlayer || !mc.getRenderViewEntity().isEntityAlive()) if(mc.getRenderViewEntity() != null && (mc.getRenderViewEntity() == mc.thePlayer || !mc.getRenderViewEntity().isEntityAlive())
&& ReplayHandler.getCameraEntity() != null && !ReplayHandler.isInPath()) { && ReplayHandler.getCameraEntity() != null && !ReplayHandler.isInPath()) {
@@ -71,7 +71,7 @@ public class TickAndRenderListener {
if(ReplayHandler.getCameraEntity() != null) if(ReplayHandler.getCameraEntity() != null)
ReplayHandler.getCameraEntity().updateMovement(); ReplayHandler.getCameraEntity().updateMovement();
if(ReplayHandler.isInPath()) { if(ReplayHandler.isInPath()) {
ReplayProcess.unblockAndTick(true); ReplayProcess.tickReplay(true);
} else onMouseMove(new MouseEvent()); } else onMouseMove(new MouseEvent());
FMLCommonHandler.instance().bus().post(new InputEvent.KeyInputEvent()); FMLCommonHandler.instance().bus().post(new InputEvent.KeyInputEvent());

18
src/main/java/eu/crushedpixel/replaymod/replay/ReplayProcess.java
View File

@@ -15,6 +15,7 @@ import eu.crushedpixel.replaymod.video.VideoRenderer;
import lombok.Getter; import lombok.Getter;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.GuiErrorScreen; import net.minecraft.client.gui.GuiErrorScreen;
import net.minecraft.client.renderer.chunk.RenderChunk;
import net.minecraft.client.resources.I18n; import net.minecraft.client.resources.I18n;
import net.minecraft.crash.CrashReport; import net.minecraft.crash.CrashReport;
import net.minecraft.util.ReportedException; import net.minecraft.util.ReportedException;
@@ -42,8 +43,6 @@ public class ReplayProcess {
private static VideoRenderer videoRenderer = null; private static VideoRenderer videoRenderer = null;
private static boolean isVideoRecording = false; private static boolean isVideoRecording = false;
private static boolean blocked = false;
private static boolean deepBlock = false;
private static boolean requestFinish = false; private static boolean requestFinish = false;
private static boolean firstTime = false; private static boolean firstTime = false;
@@ -60,8 +59,6 @@ public class ReplayProcess {
calculated = false; calculated = false;
requestFinish = false; requestFinish = false;
blocked = deepBlock = false;
lastRealTime = System.currentTimeMillis(); lastRealTime = System.currentTimeMillis();
lastRealReplayTime = 0; lastRealReplayTime = 0;
linear = ReplayMod.replaySettings.isLinearMovement(); linear = ReplayMod.replaySettings.isLinearMovement();
@@ -145,12 +142,6 @@ public class ReplayProcess {
ReplayMod.replaySender.setReplaySpeed(0); ReplayMod.replaySender.setReplaySpeed(0);
} }
public static void unblockAndTick(boolean justCheck) {
if(!deepBlock) blocked = false;
if(!blocked || !isVideoRecording())
ReplayProcess.tickReplay(justCheck);
}
//if justCheck is true, no Screenshot will be taken, it will only be checked //if justCheck is true, no Screenshot will be taken, it will only be checked
//whether all chunks have been rendered. This is necessary because no Render ticks //whether all chunks have been rendered. This is necessary because no Render ticks
//are called if the Timer speed is set to 0, leading to this method never being //are called if the Timer speed is set to 0, leading to this method never being
@@ -165,6 +156,13 @@ public class ReplayProcess {
} }
if(firstTime) { if(firstTime) {
if(RenderChunk.renderChunksUpdated != 0 || mc.currentScreen != null) {
return;
}
lastRealTime = System.currentTimeMillis();
lastRealReplayTime = 0;
firstTime = false; firstTime = false;
mc.timer.renderPartialTicks = 100; mc.timer.renderPartialTicks = 100;
mc.timer.elapsedPartialTicks = 100; mc.timer.elapsedPartialTicks = 100;