Adapted new API System with search API call

Implemented raw Pagination support to Replay Center
Fixed awkward time jumps caused by MCTimerHandler
Fixed Java 1.6 incompatibility with List.sort Method in GuiSpectateSelection
Fixed a LOT of compatibility issues with the Shader Mod
This commit is contained in:
Marius Metzger
2015-02-19 00:20:11 +01:00
parent ee05535024
commit d3a9331bf7
17 changed files with 209 additions and 129 deletions

View File

@@ -39,7 +39,6 @@ public class MCTimerHandler {
try {
if(!(getTimer() instanceof ReplayTimer)) {
timerBefore = getTimer();
System.out.println("here");
mcTimer.set(mc, rpt);
}
} catch(Exception e) {
@@ -152,12 +151,12 @@ public class MCTimerHandler {
}
return 1;
}
public static void updateTimer(double d) {
try{
try {
Timer t = getTimer();
double d2 = d;
d2 = MathHelper.clamp_double(d2, 0.0D, 1.0D);
//d2 = MathHelper.clamp_double(d2, 0.0D, 1.0D);
t.elapsedPartialTicks = (float)((double)t.elapsedPartialTicks + d2 * (double)t.timerSpeed * 20);
t.elapsedTicks = (int)t.elapsedPartialTicks;
t.elapsedPartialTicks -= (float)t.elapsedTicks;

View File

@@ -361,6 +361,9 @@ public class ReplayHandler {
ReplayMod.overlay.resetUI();
} catch(Exception e) {}
//Load lighting and trigger update
ReplayMod.replaySettings.setLightingEnabled(ReplayMod.replaySettings.isLightingEnabled());
replayActive = true;
}
@@ -397,9 +400,11 @@ public class ReplayHandler {
resetKeyframes();
if(channel != null) {
/*
if(channel != null && channel.isOpen()) {
channel.close();
}
*/
replayActive = false;
}

View File

@@ -330,7 +330,7 @@ public class ReplaySender extends ChannelInboundHandlerAdapter {
dis = new DataInputStream(archive.getInputStream(replayEntry));
setReplaySpeed(0);
} catch(IOException e) {
e.printStackTrace();
//e.printStackTrace();
}
}
}
@@ -442,6 +442,8 @@ public class ReplaySender extends ChannelInboundHandlerAdapter {
difficulty, maxPlayers, worldType, false);
}
/*
* Proof of concept for some nasty player manipulation ;)
String crPxl = "2cb08a5951f34e98bd0985d9747e80df";
String johni = "cd3d4be14ffc2f9db432db09e0cd254b";
@@ -469,6 +471,7 @@ public class ReplaySender extends ChannelInboundHandlerAdapter {
p = sp;
}
*/
if(p instanceof S07PacketRespawn) {
allowMovement = true;