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

Removed possible sources of issues with the Replay Speed value

Browse Source
This commit is contained in:
CrushedPixel
2015-05-09 17:43:18 +02:00
parent d4d2dc0da7
commit 2fe3e2091b
3 changed files with 1 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/eu/crushedpixel/replaymod/events/GuiEventHandler.java
View File

@@ -121,6 +121,7 @@ public class GuiEventHandler {
@SubscribeEvent @SubscribeEvent
public void onInit(InitGuiEvent event) { public void onInit(InitGuiEvent event) {
if(event.gui instanceof GuiIngameMenu && ReplayHandler.isInReplay()) { if(event.gui instanceof GuiIngameMenu && ReplayHandler.isInReplay()) {
ReplayMod.replaySender.setReplaySpeed(0);
for(GuiButton b : new ArrayList<GuiButton>(event.buttonList)) { for(GuiButton b : new ArrayList<GuiButton>(event.buttonList)) {
if(b.id == 1) { if(b.id == 1) {
b.displayString = I18n.format("replaymod.gui.exit"); b.displayString = I18n.format("replaymod.gui.exit");

4
src/main/java/eu/crushedpixel/replaymod/gui/GuiKeyframeRepository.java
View File

@@ -37,11 +37,8 @@ public class GuiKeyframeRepository extends GuiScreen {
private int currentSetTimeKeyframeCount, currentSetPositionKeyframeCount, currentSetDuration; private int currentSetTimeKeyframeCount, currentSetPositionKeyframeCount, currentSetDuration;
private double prevSpeed;
public GuiKeyframeRepository(KeyframeSet[] keyframeRepository) { public GuiKeyframeRepository(KeyframeSet[] keyframeRepository) {
this.keyframeRepository = keyframeRepository; this.keyframeRepository = keyframeRepository;
prevSpeed = ReplayMod.replaySender.getReplaySpeed();
ReplayMod.replaySender.setReplaySpeed(0); ReplayMod.replaySender.setReplaySpeed(0);
} }
@@ -226,7 +223,6 @@ public class GuiKeyframeRepository extends GuiScreen {
ArrayList<KeyframeSet> copy = new ArrayList<KeyframeSet>(keyframeSetList.getCopyOfElements()); ArrayList<KeyframeSet> copy = new ArrayList<KeyframeSet>(keyframeSetList.getCopyOfElements());
this.keyframeRepository = copy.toArray(new KeyframeSet[copy.size()]); this.keyframeRepository = copy.toArray(new KeyframeSet[copy.size()]);
ReplayHandler.setKeyframeRepository(keyframeRepository, true); ReplayHandler.setKeyframeRepository(keyframeRepository, true);
ReplayMod.replaySender.setReplaySpeed(prevSpeed);
} }
@Override @Override

9
src/main/java/eu/crushedpixel/replaymod/gui/GuiSpectateSelection.java
View File

@@ -29,7 +29,6 @@ public class GuiSpectateSelection extends GuiScreen {
private int lowerBound; private int lowerBound;
private double prevSpeed;
private boolean drag = false; private boolean drag = false;
private int lastY = 0; private int lastY = 0;
private int fitting = 0; private int fitting = 0;
@@ -37,8 +36,6 @@ public class GuiSpectateSelection extends GuiScreen {
private final String screenTitle = I18n.format("replaymod.gui.spectate.title"); private final String screenTitle = I18n.format("replaymod.gui.spectate.title");
public GuiSpectateSelection(List<EntityPlayer> players) { public GuiSpectateSelection(List<EntityPlayer> players) {
this.prevSpeed = ReplayMod.replaySender.getReplaySpeed();
Collections.sort(players, new PlayerComparator()); Collections.sort(players, new PlayerComparator());
this.players = new ArrayList<Pair<EntityPlayer, ResourceLocation>>(); this.players = new ArrayList<Pair<EntityPlayer, ResourceLocation>>();
@@ -84,7 +81,6 @@ public class GuiSpectateSelection extends GuiScreen {
int off = mouseY - 30; int off = mouseY - 30;
int p = (off / 21) + upperPlayer; int p = (off / 21) + upperPlayer;
ReplayHandler.spectateEntity(players.get(p).first()); ReplayHandler.spectateEntity(players.get(p).first());
ReplayMod.replaySender.setReplaySpeed(prevSpeed);
mc.displayGuiScreen(null); mc.displayGuiScreen(null);
} }
} }
@@ -115,11 +111,6 @@ public class GuiSpectateSelection extends GuiScreen {
super.mouseClickMove(mouseX, mouseY, clickedMouseButton, timeSinceLastClick); super.mouseClickMove(mouseX, mouseY, clickedMouseButton, timeSinceLastClick);
} }
@Override
public void onGuiClosed() {
ReplayMod.replaySender.setReplaySpeed(prevSpeed);
}
@Override @Override
protected void mouseReleased(int mouseX, int mouseY, int state) { protected void mouseReleased(int mouseX, int mouseY, int state) {
drag = false; drag = false;