Fix crash on exit of replay (no longer processing clicks mid-rendering) and OpenGL error warnings
Remove MCTimerHandler, instead always install the ReplayTimer
This commit is contained in:
@@ -1,91 +0,0 @@
|
||||
package eu.crushedpixel.replaymod.timer;
|
||||
|
||||
import eu.crushedpixel.replaymod.video.ReplayTimer;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.util.Timer;
|
||||
|
||||
public class MCTimerHandler {
|
||||
|
||||
private static Minecraft mc = Minecraft.getMinecraft();
|
||||
|
||||
private static ReplayTimer rpt = new ReplayTimer(20);
|
||||
private static Timer timerBefore;
|
||||
|
||||
public static void setActiveTimer() {
|
||||
if(timerBefore != null) {
|
||||
mc.timer = timerBefore;
|
||||
}
|
||||
}
|
||||
|
||||
public static void setPassiveTimer() {
|
||||
if(!(mc.timer instanceof ReplayTimer)) {
|
||||
timerBefore = mc.timer;
|
||||
mc.timer = rpt;
|
||||
}
|
||||
}
|
||||
|
||||
public static int getTicks() {
|
||||
return mc.timer.elapsedTicks;
|
||||
}
|
||||
|
||||
public static void setTicks(int ticks) {
|
||||
mc.timer.elapsedTicks = ticks;
|
||||
}
|
||||
|
||||
public static float getPartialTicks() {
|
||||
return mc.timer.elapsedPartialTicks;
|
||||
}
|
||||
|
||||
public static void setPartialTicks(float ticks) {
|
||||
mc.timer.elapsedPartialTicks = ticks;
|
||||
}
|
||||
|
||||
public static float getRenderTicks() {
|
||||
return mc.timer.renderPartialTicks;
|
||||
}
|
||||
|
||||
public static Timer getTimer() {
|
||||
return mc.timer;
|
||||
}
|
||||
|
||||
public static void advanceTicks(int ticks) {
|
||||
mc.timer.elapsedTicks += ticks;
|
||||
}
|
||||
|
||||
public static void advancePartialTicks(float ticks) {
|
||||
mc.timer.elapsedPartialTicks += ticks;
|
||||
}
|
||||
|
||||
public static void advanceRenderPartialTicks(float ticks) {
|
||||
mc.timer.renderPartialTicks += ticks;
|
||||
}
|
||||
|
||||
public static void setRenderPartialTicks(float ticks) {
|
||||
mc.timer.renderPartialTicks = ticks;
|
||||
}
|
||||
|
||||
public static float getTimerSpeed() {
|
||||
return mc.timer.timerSpeed;
|
||||
}
|
||||
|
||||
public static void setTimerSpeed(float speed) {
|
||||
mc.timer.timerSpeed = speed;
|
||||
if(timerBefore != null) {
|
||||
timerBefore.timerSpeed = speed;
|
||||
}
|
||||
}
|
||||
|
||||
public static void updateTimer(double d) {
|
||||
Timer t = mc.timer;
|
||||
//d2 = MathHelper.clamp_double(d2, 0.0D, 1.0D);
|
||||
t.elapsedPartialTicks = (float) ((double) t.elapsedPartialTicks + d * (double) t.timerSpeed * 20);
|
||||
t.elapsedTicks = (int) t.elapsedPartialTicks;
|
||||
t.elapsedPartialTicks -= (float) t.elapsedTicks;
|
||||
|
||||
if(t.elapsedTicks > 10) {
|
||||
t.elapsedTicks = 10;
|
||||
}
|
||||
|
||||
t.renderPartialTicks = t.elapsedPartialTicks;
|
||||
}
|
||||
}
|
||||
50
src/main/java/eu/crushedpixel/replaymod/timer/ReplayTimer.java
Executable file
50
src/main/java/eu/crushedpixel/replaymod/timer/ReplayTimer.java
Executable file
@@ -0,0 +1,50 @@
|
||||
package eu.crushedpixel.replaymod.timer;
|
||||
|
||||
import eu.crushedpixel.replaymod.events.handlers.MinecraftTicker;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.util.Timer;
|
||||
import org.lwjgl.LWJGLException;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.lang.reflect.InvocationTargetException;
|
||||
|
||||
public class ReplayTimer extends Timer {
|
||||
|
||||
public static ReplayTimer get(Minecraft mc) {
|
||||
Timer timer = mc.timer;
|
||||
if (!(timer instanceof ReplayTimer)) {
|
||||
throw new IllegalStateException("ReplayTimer not installed");
|
||||
}
|
||||
return (ReplayTimer) timer;
|
||||
}
|
||||
|
||||
/**
|
||||
* When the timer is set to passive, it does not advance the (render) ticks on it's own.
|
||||
*/
|
||||
public boolean passive;
|
||||
|
||||
public ReplayTimer() {
|
||||
super(20);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void updateTimer() {
|
||||
if (!passive) {
|
||||
super.updateTimer();
|
||||
}
|
||||
|
||||
if (timerSpeed == 0) {
|
||||
try {
|
||||
MinecraftTicker.runMouseKeyboardTick(Minecraft.getMinecraft());
|
||||
} catch (IllegalAccessException e) {
|
||||
e.printStackTrace();
|
||||
} catch (InvocationTargetException e) {
|
||||
e.printStackTrace();
|
||||
} catch (IOException e) {
|
||||
e.printStackTrace();
|
||||
} catch (LWJGLException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user