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

Merge branch 'stable' into develop

Browse Source
This commit is contained in:
Jonas Herzig
2020-09-27 18:45:05 +02:00
parent cff6034079 9cf8ec4e06
commit 9af562957f
18 changed files with 129 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/com/replaymod/replay/gui/overlay/GuiMarkerTimeline.java
View File

@@ -4,6 +4,7 @@ import com.replaymod.core.ReplayMod;
import com.replaymod.core.versions.MCVer.Keyboard;
import com.replaymod.replay.ReplayHandler;
import com.replaymod.replay.ReplayModReplay;
import com.replaymod.replay.camera.CameraEntity;
import com.replaymod.replaystudio.data.Marker;
import com.replaymod.replaystudio.util.Location;
import de.johni0702.minecraft.gui.GuiRenderer;
@@ -168,11 +169,14 @@ public class GuiMarkerTimeline extends AbstractGuiTimeline<GuiMarkerTimeline> im
} else if (button == 1) { // Right click
selectedMarker = null;
if (replayHandler != null) {
replayHandler.setTargetPosition(new Location(
marker.getX(), marker.getY(), marker.getZ(),
marker.getPitch(), marker.getYaw()
));
replayHandler.doJump(marker.getTime(), false);
CameraEntity cameraEntity = replayHandler.getCameraEntity();
if (cameraEntity != null) {
cameraEntity.setCameraPosRot(new Location(
marker.getX(), marker.getY(), marker.getZ(),
marker.getYaw(), marker.getPitch()
));
}
replayHandler.doJump(marker.getTime(), true);
} else {
setCursorPosition(marker.getTime());
}