From 13283fb5d2255efdae400e6cd1e9d637488361ff Mon Sep 17 00:00:00 2001 From: Jonas Herzig Date: Mon, 30 Mar 2020 01:08:15 +0200 Subject: [PATCH] Fix compilation of 1.14.4-forge --- jGui | 2 +- .../java/com/replaymod/render/mixin/Mixin_CubicRotation.java | 2 +- src/main/java/com/replaymod/replay/QuickReplaySender.java | 5 ----- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/jGui b/jGui index b434c785..716fd1b9 160000 --- a/jGui +++ b/jGui @@ -1 +1 @@ -Subproject commit b434c785291baca42307c6584f3abe99938ca6cf +Subproject commit 716fd1b9ed28a0f262f772500b3e55e21047f10b diff --git a/src/main/java/com/replaymod/render/mixin/Mixin_CubicRotation.java b/src/main/java/com/replaymod/render/mixin/Mixin_CubicRotation.java index 6d69b662..e86f9d47 100644 --- a/src/main/java/com/replaymod/render/mixin/Mixin_CubicRotation.java +++ b/src/main/java/com/replaymod/render/mixin/Mixin_CubicRotation.java @@ -78,7 +78,7 @@ public abstract class Mixin_CubicRotation { y = 1; break; } - //#if MC>=11400 + //#if MC>=11500 //$$ matrixStack.multiply(new Vector3f(x, y, 0).getDegreesQuaternion(angle)); //#else GL11.glRotatef(angle, x, y, 0); diff --git a/src/main/java/com/replaymod/replay/QuickReplaySender.java b/src/main/java/com/replaymod/replay/QuickReplaySender.java index ed243055..b433cf67 100644 --- a/src/main/java/com/replaymod/replay/QuickReplaySender.java +++ b/src/main/java/com/replaymod/replay/QuickReplaySender.java @@ -34,11 +34,6 @@ import de.johni0702.minecraft.gui.versions.callbacks.PreTickCallback; //$$ import static com.replaymod.core.versions.MCVer.FML_BUS; //#endif -//#if FABRIC>=1 -//#else -//$$ import com.github.steveice10.mc.protocol.data.game.setting.Difficulty; -//#endif - import javax.annotation.Nullable; import java.io.IOException; import java.util.Collections;