From cfdc4b97139be2826781fed362208b3ca7a33448 Mon Sep 17 00:00:00 2001 From: Jonas Herzig Date: Sat, 25 May 2019 18:57:32 +0200 Subject: [PATCH] Remove workaround for super-super-class remapping bug --- .../replaymod/replay/InputReplayTimer.java | 22 +++++++++---------- versions/common.gradle | 2 +- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/replaymod/replay/InputReplayTimer.java b/src/main/java/com/replaymod/replay/InputReplayTimer.java index d424cd11..016b5e87 100644 --- a/src/main/java/com/replaymod/replay/InputReplayTimer.java +++ b/src/main/java/com/replaymod/replay/InputReplayTimer.java @@ -41,18 +41,16 @@ public class InputReplayTimer extends WrappedTimer { } @Override - //#if MC>=11300 - //#if MC>=11400 - // FIXME this should be handled by the preprocessor but there seems to be a bug - public void beginRenderTick(long sysClock) { - //#else - //$$ public void updateTimer(long sysClock) { - //#endif - super.beginRenderTick(sysClock); - //#else - //$$ public void updateTimer() { - //$$ super.updateTimer(); - //#endif + public void beginRenderTick( + //#if MC>=11300 + long sysClock + //#endif + ) { + super.beginRenderTick( + //#if MC>=11300 + sysClock + //#endif + ); // 1.7.10: We have to run the scheduled executables (ours only) because MC would only run them every tick //#if MC<=10710 diff --git a/versions/common.gradle b/versions/common.gradle index 77351edf..0444eb04 100644 --- a/versions/common.gradle +++ b/versions/common.gradle @@ -45,7 +45,7 @@ buildscript { 'e93f77b4' // FG 1.2 ) } - classpath 'com.github.replaymod:preprocessor:6be682c' + classpath 'com.github.replaymod:preprocessor:eb4fac9' } }