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

Got rid of the OpenEmbeddedChannel, an artifact of the ReplayMod's very beginning. Rest in Peace, old friend.

Browse Source
This commit is contained in:
CrushedPixel
2015-07-09 16:30:42 +02:00
parent 16b74d9824
commit 609c731dc0
2 changed files with 4 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/main/java/eu/crushedpixel/replaymod/replay/OpenEmbeddedChannel.java
View File

@@ -1,30 +0,0 @@
package eu.crushedpixel.replaymod.replay;
import io.netty.channel.ChannelFuture;
import io.netty.channel.embedded.EmbeddedChannel;
import net.minecraft.network.NetworkManager;
public class OpenEmbeddedChannel extends EmbeddedChannel {
private boolean ignoreClose = false;
public OpenEmbeddedChannel(NetworkManager networkManager) {
super(networkManager);
}
@Override
public boolean finish() {
System.out.println("wanted to finish");
ignoreClose = true;
return super.finish();
}
@Override
public ChannelFuture close() {
if(ignoreClose) {
ignoreClose = false;
return null;
}
return pipeline().close();
}
}

7
src/main/java/eu/crushedpixel/replaymod/replay/ReplayHandler.java
View File

@@ -14,6 +14,7 @@ import eu.crushedpixel.replaymod.settings.RenderOptions;
import eu.crushedpixel.replaymod.utils.ReplayFile; import eu.crushedpixel.replaymod.utils.ReplayFile;
import eu.crushedpixel.replaymod.utils.ReplayFileIO; import eu.crushedpixel.replaymod.utils.ReplayFileIO;
import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelHandlerContext;
import io.netty.channel.embedded.EmbeddedChannel;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
@@ -41,7 +42,7 @@ public class ReplayHandler {
public static long lastExit = 0; public static long lastExit = 0;
private static NetworkManager networkManager; private static NetworkManager networkManager;
private static Minecraft mc = Minecraft.getMinecraft(); private static Minecraft mc = Minecraft.getMinecraft();
private static OpenEmbeddedChannel channel; private static EmbeddedChannel channel;
private static int realTimelinePosition = 0; private static int realTimelinePosition = 0;
private static Keyframe selectedKeyframe; private static Keyframe selectedKeyframe;
@@ -429,7 +430,7 @@ public class ReplayHandler {
INetHandlerPlayClient pc = new NetHandlerPlayClient(mc, null, networkManager, new GameProfile(UUID.randomUUID(), "Player")); INetHandlerPlayClient pc = new NetHandlerPlayClient(mc, null, networkManager, new GameProfile(UUID.randomUUID(), "Player"));
networkManager.setNetHandler(pc); networkManager.setNetHandler(pc);
channel = new OpenEmbeddedChannel(networkManager); channel = new EmbeddedChannel(networkManager);
channel.attr(NetworkDispatcher.FML_DISPATCHER).set(new NetworkDispatcher(networkManager)); channel.attr(NetworkDispatcher.FML_DISPATCHER).set(new NetworkDispatcher(networkManager));
// Open replay // Open replay
@@ -488,7 +489,7 @@ public class ReplayHandler {
INetHandlerPlayClient pc = new NetHandlerPlayClient(mc, null, networkManager, new GameProfile(UUID.randomUUID(), "Player")); INetHandlerPlayClient pc = new NetHandlerPlayClient(mc, null, networkManager, new GameProfile(UUID.randomUUID(), "Player"));
networkManager.setNetHandler(pc); networkManager.setNetHandler(pc);
channel = new OpenEmbeddedChannel(networkManager); channel = new EmbeddedChannel(networkManager);
channel.attr(NetworkDispatcher.FML_DISPATCHER).set(new NetworkDispatcher(networkManager)); channel.attr(NetworkDispatcher.FML_DISPATCHER).set(new NetworkDispatcher(networkManager));
channel.pipeline().addFirst(ReplayMod.replaySender); channel.pipeline().addFirst(ReplayMod.replaySender);