.tmcpr files are now being deleted upon starting the game

Finally fixed Replay code
Finally fixed Lighting code
This commit is contained in:
Marius Metzger
2015-04-06 16:00:08 +02:00
parent e4d282bffe
commit 66e27a97a4
10 changed files with 103 additions and 68 deletions

View File

@@ -69,6 +69,7 @@ import eu.crushedpixel.replaymod.holders.Position;
import eu.crushedpixel.replaymod.recording.ConnectionEventHandler;
import eu.crushedpixel.replaymod.recording.ReplayMetaData;
import eu.crushedpixel.replaymod.reflection.MCPNames;
import eu.crushedpixel.replaymod.registry.LightingHandler;
import eu.crushedpixel.replaymod.timer.MCTimerHandler;
import eu.crushedpixel.replaymod.utils.ReplayFileIO;
@@ -81,9 +82,7 @@ public class ReplaySender extends ChannelInboundHandlerAdapter {
private long lastTimeStamp, lastPacketSent;
private boolean hasRestarted = false;
private long toleratedTimeStamp = Long.MAX_VALUE;
private File replayFile;
private boolean active = true;
private ZipFile archive;
@@ -131,6 +130,10 @@ public class ReplaySender extends ChannelInboundHandlerAdapter {
public int replayLength() {
return replayLength;
}
public void stopHurrying() {
hurryToTimestamp = false;
}
public void terminateReplay() {
terminate = true;
@@ -150,11 +153,6 @@ public class ReplaySender extends ChannelInboundHandlerAdapter {
if(!(ReplayHandler.isInPath() && ReplayProcess.isVideoRecording())) setReplaySpeed(replaySpeed);
if((millis < currentTimeStamp && !isHurrying())) {
if(ReplayHandler.isInPath()) {
if(millis < toleratedTimeStamp) {
return;
}
}
startFromBeginning = true;
}
@@ -207,8 +205,6 @@ public class ReplaySender extends ChannelInboundHandlerAdapter {
e.printStackTrace();
}
ReplayHandler.setInitialGamma(mc.gameSettings.gammaSetting);
this.replayFile = replayFile;
this.networkManager = nm;
if(("."+FilenameUtils.getExtension(replayFile.getAbsolutePath())).equals(ConnectionEventHandler.ZIP_FILE_EXTENSION)) {
@@ -294,12 +290,6 @@ public class ReplaySender extends ChannelInboundHandlerAdapter {
lastTimeStamp = currentTimeStamp;
if(ReplayHandler.isInPath()) {
toleratedTimeStamp = lastTimeStamp;
} else {
toleratedTimeStamp = -1;
}
if(hurryToTimestamp && currentTimeStamp >= desiredTimeStamp && !startFromBeginning) {
hurryToTimestamp = false;
if(!ReplayHandler.isInPath() || hasRestarted) {