Change ReplayHandler and KeyframesModifyEvent to use AdvancedPositionKeyframeList instead of KeyframeList<AdvancedPosition>

This commit is contained in:
CrushedPixel
2015-09-10 01:46:17 +02:00
parent 0d30350967
commit da9ce46613
2 changed files with 5 additions and 4 deletions

View File

@@ -1,7 +1,7 @@
package eu.crushedpixel.replaymod.events; package eu.crushedpixel.replaymod.events;
import eu.crushedpixel.replaymod.holders.AdvancedPosition;
import eu.crushedpixel.replaymod.holders.TimestampValue; import eu.crushedpixel.replaymod.holders.TimestampValue;
import eu.crushedpixel.replaymod.interpolation.AdvancedPositionKeyframeList;
import eu.crushedpixel.replaymod.interpolation.KeyframeList; import eu.crushedpixel.replaymod.interpolation.KeyframeList;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
@@ -13,7 +13,7 @@ import net.minecraftforge.fml.common.eventhandler.Event;
@EqualsAndHashCode(callSuper=true) @EqualsAndHashCode(callSuper=true)
public class KeyframesModifyEvent extends Event { public class KeyframesModifyEvent extends Event {
private KeyframeList<AdvancedPosition> positionKeyframes; private AdvancedPositionKeyframeList positionKeyframes;
private KeyframeList<TimestampValue> timeKeyframes; private KeyframeList<TimestampValue> timeKeyframes;
} }

View File

@@ -10,6 +10,7 @@ import eu.crushedpixel.replaymod.events.KeyframesModifyEvent;
import eu.crushedpixel.replaymod.events.ReplayExitEvent; import eu.crushedpixel.replaymod.events.ReplayExitEvent;
import eu.crushedpixel.replaymod.gui.overlay.GuiReplayOverlay; import eu.crushedpixel.replaymod.gui.overlay.GuiReplayOverlay;
import eu.crushedpixel.replaymod.holders.*; import eu.crushedpixel.replaymod.holders.*;
import eu.crushedpixel.replaymod.interpolation.AdvancedPositionKeyframeList;
import eu.crushedpixel.replaymod.interpolation.KeyframeList; import eu.crushedpixel.replaymod.interpolation.KeyframeList;
import eu.crushedpixel.replaymod.preparation.EntityPositionTracker; import eu.crushedpixel.replaymod.preparation.EntityPositionTracker;
import eu.crushedpixel.replaymod.registry.LightingHandler; import eu.crushedpixel.replaymod.registry.LightingHandler;
@@ -54,7 +55,7 @@ public class ReplayHandler {
private static boolean inPath = false; private static boolean inPath = false;
private static KeyframeList<AdvancedPosition> positionKeyframes = new KeyframeList<AdvancedPosition>(); private static AdvancedPositionKeyframeList positionKeyframes = new AdvancedPositionKeyframeList();
private static KeyframeList<TimestampValue> timeKeyframes = new KeyframeList<TimestampValue>(); private static KeyframeList<TimestampValue> timeKeyframes = new KeyframeList<TimestampValue>();
private static boolean inReplay = false; private static boolean inReplay = false;
@@ -268,7 +269,7 @@ public class ReplayHandler {
fireKeyframesModifyEvent(); fireKeyframesModifyEvent();
} }
public static KeyframeList<AdvancedPosition> getPositionKeyframes() { public static AdvancedPositionKeyframeList getPositionKeyframes() {
return positionKeyframes; return positionKeyframes;
} }