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

Correctly parse Keyframe Presets with the new Spectator Keyframes from JSON

Browse Source
This commit is contained in:
CrushedPixel
2015-09-04 17:51:31 +02:00
parent 1b8c5dc47a
commit 1e0f5de800
2 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/eu/crushedpixel/replaymod/holders/SpectatorData.java
View File

@@ -14,7 +14,7 @@ import net.minecraft.entity.Entity;
@EqualsAndHashCode(callSuper=true) @EqualsAndHashCode(callSuper=true)
public class SpectatorData extends AdvancedPosition { public class SpectatorData extends AdvancedPosition {
private int spectatedEntityID; private Integer spectatedEntityID;
public SpectatorData(double x, double y, double z, double pitch, double yaw, double roll, int entityID) { public SpectatorData(double x, double y, double z, double pitch, double yaw, double roll, int entityID) {
super(x, y, z, pitch, yaw, roll); super(x, y, z, pitch, yaw, roll);
@@ -30,6 +30,15 @@ public class SpectatorData extends AdvancedPosition {
this.spectatedEntityID = e.getEntityId(); this.spectatedEntityID = e.getEntityId();
} }
/**
* @return itself if it's a valid SpectatorData object,
* otherwise a new AdvancedPosition object containing the same position data
*/
public AdvancedPosition normalize() {
if(spectatedEntityID != null) return this;
return new AdvancedPosition(x, y, z, pitch, yaw, roll);
}
@Override @Override
public SpectatorData newInstance() { public SpectatorData newInstance() {
return new SpectatorData(); return new SpectatorData();

9
src/main/java/eu/crushedpixel/replaymod/utils/LegacyKeyframeSetAdapter.java
View File

@@ -5,10 +5,7 @@ import com.google.gson.TypeAdapter;
import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonReader;
import com.google.gson.stream.JsonWriter; import com.google.gson.stream.JsonWriter;
import eu.crushedpixel.replaymod.assets.CustomImageObject; import eu.crushedpixel.replaymod.assets.CustomImageObject;
import eu.crushedpixel.replaymod.holders.AdvancedPosition; import eu.crushedpixel.replaymod.holders.*;
import eu.crushedpixel.replaymod.holders.Keyframe;
import eu.crushedpixel.replaymod.holders.KeyframeSet;
import eu.crushedpixel.replaymod.holders.TimestampValue;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
@@ -47,8 +44,8 @@ public class LegacyKeyframeSetAdapter extends TypeAdapter<KeyframeSet[]> {
while(in.hasNext()) { while(in.hasNext()) {
String jsonKeyframeTag = in.nextName(); String jsonKeyframeTag = in.nextName();
if("value".equals(jsonKeyframeTag) || "position".equals(jsonKeyframeTag)) { if("value".equals(jsonKeyframeTag) || "position".equals(jsonKeyframeTag)) {
AdvancedPosition position = new Gson().fromJson(in, AdvancedPosition.class); SpectatorData spectatorData = new Gson().fromJson(in, SpectatorData.class);
newKeyframe.setValue(position); newKeyframe.setValue(spectatorData.normalize());
} else if("realTimestamp".equals(jsonKeyframeTag)) { } else if("realTimestamp".equals(jsonKeyframeTag)) {
newKeyframe.setRealTimestamp(in.nextInt()); newKeyframe.setRealTimestamp(in.nextInt());
} else if("spectatedEntityID".equals(jsonKeyframeTag)) { } else if("spectatedEntityID".equals(jsonKeyframeTag)) {