diff --git a/build.gradle b/build.gradle index cceffd06..99f3dd15 100644 --- a/build.gradle +++ b/build.gradle @@ -338,7 +338,7 @@ dependencies { shadow 'com.github.ReplayMod.JavaBlend:2.79.0:a0696f8' - shadow "com.github.ReplayMod:ReplayStudio:9c5dec8", shadeExclusions + shadow "com.github.ReplayMod:ReplayStudio:6d081f6", shadeExclusions implementation(FABRIC ? dependencies.project(path: jGui.path, configuration: "namedElements") : jGui) { transitive = false // FG 1.2 puts all MC deps into the compile configuration and we don't want to shade those diff --git a/docs/content.md b/docs/content.md index faea3ff2..0681006f 100755 --- a/docs/content.md +++ b/docs/content.md @@ -465,7 +465,7 @@ If you have a Replay in a dark setting (for example at nighttime, or in a cave) This works as a replacement for the **Night Vision Potion Effect**, without the side effect of a weird sky color. -## Quick Mode [quickmode] (Minecraft 1.9 and up) +## Quick Mode [quickmode] ![](img/quickmode-icon.jpg) In **Quick Mode**, this clock symbol is displayed in the lower right corner of the screen. @@ -473,8 +473,6 @@ When you first enable **Quick Mode** in a replay, an internal reference of certa As a side effect, certain features like particles and second skin layers will not be rendered in the preview. By default, **Quick Mode** is toggled with `Q`. -**Quick Mode** is available in ReplayMod for Minecraft 1.9.4 and up. - ## Player Overview [overview] ![](img/player-overview.jpg) The **Player Overview** Screen diff --git a/src/main/java/com/replaymod/replay/QuickReplaySender.java b/src/main/java/com/replaymod/replay/QuickReplaySender.java index 0b613f4a..6592b47d 100644 --- a/src/main/java/com/replaymod/replay/QuickReplaySender.java +++ b/src/main/java/com/replaymod/replay/QuickReplaySender.java @@ -1,4 +1,4 @@ -//#if MC>=10904 +//#if MC>=10800 package com.replaymod.replay; import com.google.common.util.concurrent.FutureCallback; @@ -78,7 +78,11 @@ public class QuickReplaySender extends ChannelHandlerAdapter implements ReplaySe wrappedBuf.writerIndex(size); PacketByteBuf packetByteBuf = new PacketByteBuf(wrappedBuf); + //#if MC>=10809 Packet mcPacket; + //#else + //$$ Packet mcPacket; + //#endif //#if MC>=11700 //$$ mcPacket = NetworkState.PLAY.getPacketHandler(NetworkSide.CLIENTBOUND, packet.getId(), packetByteBuf); //#elseif MC>=11500 diff --git a/src/main/java/com/replaymod/replay/ReplayHandler.java b/src/main/java/com/replaymod/replay/ReplayHandler.java index 75370265..99e90c36 100644 --- a/src/main/java/com/replaymod/replay/ReplayHandler.java +++ b/src/main/java/com/replaymod/replay/ReplayHandler.java @@ -69,7 +69,7 @@ import net.minecraft.entity.LivingEntity; //$$ import io.netty.channel.ChannelOutboundHandlerAdapter; //#endif -//#if MC<10904 +//#if MC<10800 //$$ import de.johni0702.minecraft.gui.element.GuiLabel; //$$ import de.johni0702.minecraft.gui.popup.GuiInfoPopup; //$$ import de.johni0702.minecraft.gui.utils.Colors; @@ -119,11 +119,11 @@ public class ReplayHandler { * Decodes and sends packets into channel. */ private final FullReplaySender fullReplaySender; - //#if MC>=10904 + //#if MC>=10800 private final QuickReplaySender quickReplaySender; private boolean quickMode = false; //#else - //$$ private static final String QUICK_MODE_MIN_MC = "1.9.4"; + //$$ private static final String QUICK_MODE_MIN_MC = "1.8"; //#endif /** @@ -160,7 +160,7 @@ public class ReplayHandler { markers = replayFile.getMarkers().or(Collections.emptySet()); fullReplaySender = new FullReplaySender(this, replayFile, false); - //#if MC>=10904 + //#if MC>=10800 quickReplaySender = new QuickReplaySender(ReplayModReplay.instance, replayFile); //#endif @@ -206,7 +206,7 @@ public class ReplayHandler { ReplayClosingCallback.EVENT.invoker().replayClosing(this); fullReplaySender.terminateReplay(); - //#if MC>=10904 + //#if MC>=10800 if (quickMode) { quickReplaySender.unregister(); } @@ -308,7 +308,7 @@ public class ReplayHandler { //$$ channel = new EmbeddedChannel(dummyHandler); //$$ channel.pipeline().remove(dummyHandler); //#endif - //#if MC>=10904 + //#if MC>=10800 channel.pipeline().addLast("ReplayModReplay_quickReplaySender", quickReplaySender); //#endif channel.pipeline().addLast("ReplayModReplay_replaySender", fullReplaySender); @@ -329,7 +329,7 @@ public class ReplayHandler { } public ReplaySender getReplaySender() { - //#if MC>=10904 + //#if MC>=10800 return quickMode ? quickReplaySender : fullReplaySender; //#else //$$ return fullReplaySender; @@ -340,7 +340,7 @@ public class ReplayHandler { return overlay; } - //#if MC>=10904 + //#if MC>=10800 public void ensureQuickModeInitialized(Runnable andThen) { if (Utils.ifMinimalModeDoPopup(overlay, () -> {})) return; ListenableFuture future = quickReplaySender.getInitializationPromise(); @@ -538,7 +538,7 @@ public class ReplayHandler { return; // path playback, rendering, etc. -> no jumping allowed } - //#if MC>=10904 + //#if MC>=10800 if (getReplaySender() == quickReplaySender) { // Always round to full tick targetTime = targetTime + targetTime % 50;