DIvan2000/ReplayModCinematic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Enable Quick Mode for 1.8.x

Browse Source
This commit is contained in:
Jonas Herzig
2022-03-06 11:46:01 +01:00
parent 74049dad77
commit 1fa027f362
4 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/replaymod/replay/QuickReplaySender.java
View File

@@ -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

18
src/main/java/com/replaymod/replay/ReplayHandler.java
View File

@@ -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<Void> 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;