Switch core to 1.14 (generated via ./gradlew :1.14:setCoreVersion)

This commit is contained in:
Jonas Herzig
2019-05-10 14:09:22 +02:00
parent 7f7d33def8
commit 7cbf7f7c94
183 changed files with 3250 additions and 3250 deletions

View File

@@ -3,35 +3,35 @@ package com.replaymod.pathing.player;
import com.replaymod.core.utils.WrappedTimer;
import net.fabricmc.fabric.api.event.Event;
import net.fabricmc.fabric.api.event.EventFactory;
import net.minecraft.util.Timer;
import net.minecraft.client.render.RenderTickCounter;
/**
* Wrapper around the current timer that prevents the timer from advancing by itself.
*/
public class ReplayTimer extends WrappedTimer {
//#if MC>=11300
private final Timer state = new Timer(0, 0);
private final RenderTickCounter state = new RenderTickCounter(0, 0);
//#else
//$$ private final Timer state = new Timer(0);
//#endif
public ReplayTimer(Timer wrapped) {
public ReplayTimer(RenderTickCounter wrapped) {
super(wrapped);
}
@Override
// This should be handled by Remap but it isn't (was handled before a9724e3).
//#if MC>=11400
//$$ public void beginRenderTick(
public void beginRenderTick(
//#else
public void updateTimer(
//$$ public void updateTimer(
//#endif
//#if MC>=11300
long sysClock
//#endif
) {
copy(this, state); // Save our current state
wrapped.updateTimer(
wrapped.beginRenderTick(
//#if MC>=11300
sysClock
//#endif
@@ -40,7 +40,7 @@ public class ReplayTimer extends WrappedTimer {
UpdatedCallback.EVENT.invoker().onUpdate();
}
public Timer getWrapped() {
public RenderTickCounter getWrapped() {
return wrapped;
}