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

Added and fixed basic saving of recording player

Browse Source
This commit is contained in:
Marius Metzger
2015-01-16 21:39:30 +01:00
parent 1afdd6df2b
commit 69a196fe74
9 changed files with 210 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/eu/crushedpixel/replaymod/replay/ReplayHandler.java
View File

@@ -229,18 +229,13 @@ public class ReplayHandler {
public static void resetKeyframes() {
keyframes = new ArrayList<Keyframe>();
selectKeyframe(null);
}
public static void setReplayPos(int pos) {
if(replaySender != null) {
replaySender.jumpToTime(pos, false);
}
}
public static void forceReplayPos(int pos) {
if(replaySender != null) {
replaySender.jumpToTime(pos, true);
replaySender.jumpToTime(pos);
}
}

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

@@ -56,7 +56,7 @@ public class ReplayProcess {
if(ts < ReplayHandler.getReplayTime()) {
mc.displayGuiScreen((GuiScreen)null);
}
ReplayHandler.forceReplayPos(ts);
ReplayHandler.setReplayPos(ts);
}
ChatMessageRequests.addChatMessage("Replay started!", ChatMessageType.INFORMATION);
@@ -69,7 +69,7 @@ public class ReplayProcess {
ReplayHandler.setSpeed(previousReplaySpeed);
ReplayHandler.setSpeed(0);
}
public static void tickReplay() {
if(ReplayHandler.isHurrying()) {
lastRealTime = System.currentTimeMillis();
@@ -128,7 +128,7 @@ public class ReplayProcess {
PositionKeyframe nextPos = ReplayHandler.getNextPositionKeyframe(curRealReplayTime);
ReplayHandler.setRealTimelineCursor(curRealReplayTime);
int lastPosStamp = 0;
int nextPosStamp = 0;
@@ -188,28 +188,19 @@ public class ReplayProcess {
pos = motionLinear.getPoint(Math.max(0, Math.min(1, splinePos)));
}
int curPos = timeLinear.getPoint(Math.max(0, Math.min(1, timePos)));
//set replay speed
if(pos != null) ReplayHandler.getCameraEntity().movePath(pos);
//System.out.println(curSpeed+" | "+curPos);
ReplayHandler.setSpeed(curSpeed);
//System.out.println("sent "+curPos);
ReplayHandler.setReplayPos(curPos);
//calculate replay speed
/*
int ts = timeLinear.getPoint(Math.max(0, Math.min(1, splinePos)));
if(ts != lastTimestamp) {
lastTimestamp = ts;
Integer curPos = null;
if(timeLinear != null) {
curPos = timeLinear.getPoint(Math.max(0, Math.min(1, timePos)));
}
*/
if(pos != null) ReplayHandler.getCameraEntity().movePath(pos);
ReplayHandler.setSpeed(curSpeed);
if(curPos != null) ReplayHandler.setReplayPos(curPos);
//splinePos = (index of last entry + add) / total entries
lastRealReplayTime = curRealReplayTime;
lastRealTime = curTime;

52
src/main/java/eu/crushedpixel/replaymod/replay/ReplaySender.java
View File

@@ -20,6 +20,7 @@ import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.GuiDownloadTerrain;
import net.minecraft.client.particle.EffectRenderer;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.network.EnumConnectionState;
import net.minecraft.network.EnumPacketDirection;
import net.minecraft.network.NetworkManager;
@@ -30,11 +31,10 @@ import net.minecraft.network.play.server.S02PacketChat;
import net.minecraft.network.play.server.S06PacketUpdateHealth;
import net.minecraft.network.play.server.S08PacketPlayerPosLook;
import net.minecraft.network.play.server.S0BPacketAnimation;
import net.minecraft.network.play.server.S0CPacketSpawnPlayer;
import net.minecraft.network.play.server.S14PacketEntity;
import net.minecraft.network.play.server.S18PacketEntityTeleport;
import net.minecraft.network.play.server.S1CPacketEntityMetadata;
import net.minecraft.network.play.server.S1DPacketEntityEffect;
import net.minecraft.network.play.server.S1FPacketSetExperience;
import net.minecraft.network.play.server.S28PacketEffect;
import net.minecraft.network.play.server.S29PacketSoundEffect;
import net.minecraft.network.play.server.S2BPacketChangeGameState;
@@ -48,13 +48,11 @@ import net.minecraft.network.play.server.S39PacketPlayerAbilities;
import net.minecraft.network.play.server.S43PacketCamera;
import net.minecraft.network.play.server.S45PacketTitle;
import net.minecraft.network.play.server.S48PacketResourcePackSend;
import net.minecraft.network.play.server.S14PacketEntity.S17PacketEntityLookMove;
import net.minecraft.util.Timer;
import net.minecraft.world.EnumDifficulty;
import net.minecraft.world.WorldSettings.GameType;
import net.minecraft.world.WorldType;
import net.minecraftforge.fml.client.FMLClientHandler;
import net.minecraftforge.fml.common.FMLCommonHandler;
import org.apache.commons.compress.archivers.zip.ZipArchiveEntry;
import org.apache.commons.compress.archivers.zip.ZipFile;
@@ -75,6 +73,10 @@ public class ReplaySender extends ChannelInboundHandlerAdapter {
private long desiredTimeStamp;
private long lastTimeStamp, lastPacketSent;
private boolean hasRestarted = false;
private long toleratedTimeStamp = Long.MAX_VALUE;
private File replayFile;
private PacketDeserializer ds = new PacketDeserializer(EnumPacketDirection.SERVERBOUND);
private boolean active = true;
@@ -87,8 +89,6 @@ public class ReplaySender extends ChannelInboundHandlerAdapter {
private NetworkManager networkManager;
private boolean terminate = false;
private float defaultReplaySpeed = 0.5f;
private double replaySpeed = 1f;
private Field joinPacketEntityId, joinPacketWorldType,
@@ -135,13 +135,16 @@ public class ReplaySender extends ChannelInboundHandlerAdapter {
}
}
public void jumpToTime(int millis, boolean force) {
public void jumpToTime(int millis) {
setReplaySpeed(replaySpeed);
if((millis < currentTimeStamp && !isHurrying())) {
if(!(ReplayHandler.isReplaying() && !force)) {
startFromBeginning = true;
if(ReplayHandler.isReplaying()) {
if(millis < toleratedTimeStamp) {
return;
}
}
startFromBeginning = true;
}
desiredTimeStamp = millis;
@@ -244,6 +247,7 @@ public class ReplaySender extends ChannelInboundHandlerAdapter {
}
while(!terminate) {
if(startFromBeginning) {
hasRestarted = true;
currentTimeStamp = 0;
dis.close();
dis = new DataInputStream(archive.getInputStream(replayEntry));
@@ -265,17 +269,17 @@ public class ReplaySender extends ChannelInboundHandlerAdapter {
* If hurrying, don't wait for correct timing.
*/
if(!hurryToTimestamp && ReplayHandler.isReplaying()) {
continue;
}
int timestamp = dis.readInt();
currentTimeStamp = timestamp;
if(!ReplayHandler.isReplaying() && !hurryToTimestamp && !FMLClientHandler.instance().isGUIOpen(GuiDownloadTerrain.class)) {
//if(!hurryToTimestamp && !FMLClientHandler.instance().isGUIOpen(GuiDownloadTerrain.class)) {
//if(!hurryToTimestamp && !FMLClientHandler.instance().isGUIOpen(GuiDownloadTerrain.class)) {
int timeWait = (int)Math.round((currentTimeStamp - lastTimeStamp)/replaySpeed);
long timeDiff = System.currentTimeMillis() - lastPacketSent;
lastPacketSent = System.currentTimeMillis();
@@ -291,11 +295,23 @@ public class ReplaySender extends ChannelInboundHandlerAdapter {
lastTimeStamp = currentTimeStamp;
if(ReplayHandler.isReplaying()) {
toleratedTimeStamp = lastTimeStamp;
} else {
toleratedTimeStamp = -1;
}
if(hurryToTimestamp && currentTimeStamp >= desiredTimeStamp && !startFromBeginning) {
hurryToTimestamp = false;
if(!ReplayHandler.isReplaying() || hasRestarted) {
((Timer)mcTimer.get(mc)).elapsedPartialTicks = 5;
((Timer)mcTimer.get(mc)).elapsedTicks = 5;
((Timer)mcTimer.get(mc)).renderPartialTicks = 5;
}
if(!ReplayHandler.isReplaying()) {
setReplaySpeed(0);
}
hasRestarted = false;
}
} catch(EOFException eof) {
@@ -321,6 +337,9 @@ public class ReplaySender extends ChannelInboundHandlerAdapter {
add(S30PacketWindowItems.class);
add(S36PacketSignEditorOpen.class);
add(S37PacketStatistics.class);
add(S1FPacketSetExperience.class);
add(S43PacketCamera.class);
add(S39PacketPlayerAbilities.class);
}
};
@@ -391,8 +410,13 @@ public class ReplaySender extends ChannelInboundHandlerAdapter {
difficulty, maxPlayers, worldType, false);
}
if(p instanceof S39PacketPlayerAbilities) {
return;
if(p instanceof S18PacketEntityTeleport) {
//System.out.println(((S18PacketEntityTeleport) p).func_149449_d());
if(mc.theWorld != null) {
for(EntityPlayer ep : (List<EntityPlayer>)mc.theWorld.playerEntities) {
System.out.println(ep.posX+" "+ep.posY+" "+ep.posZ);
}
}
}
if(p instanceof S08PacketPlayerPosLook) {