Removed "Null returned as hitResult" error message from log
This commit is contained in:
@@ -80,6 +80,7 @@ public class ReplayMod {
|
|||||||
MinecraftForge.EVENT_BUS.register(new GuiEventHandler());
|
MinecraftForge.EVENT_BUS.register(new GuiEventHandler());
|
||||||
|
|
||||||
FMLCommonHandler.instance().bus().register(new KeyInputHandler());
|
FMLCommonHandler.instance().bus().register(new KeyInputHandler());
|
||||||
|
MinecraftForge.EVENT_BUS.register(new MouseInputHandler());
|
||||||
|
|
||||||
recordingHandler = new RecordingHandler();
|
recordingHandler = new RecordingHandler();
|
||||||
FMLCommonHandler.instance().bus().register(recordingHandler);
|
FMLCommonHandler.instance().bus().register(recordingHandler);
|
||||||
|
|||||||
@@ -99,6 +99,14 @@ public class GuiReplayOverlay extends Gui {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@SubscribeEvent
|
||||||
|
public void onRenderTabList(RenderGameOverlayEvent.Pre event) { //cancelling tab list rendering and rendering help instead
|
||||||
|
if(ReplayHandler.isInReplay() && event.type == RenderGameOverlayEvent.ElementType.PLAYER_LIST) {
|
||||||
|
event.setCanceled(true);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@SubscribeEvent
|
@SubscribeEvent
|
||||||
public void renderRecordingIndicator(RenderGameOverlayEvent.Text event) {
|
public void renderRecordingIndicator(RenderGameOverlayEvent.Text event) {
|
||||||
if(!ReplayHandler.isInReplay() && ReplayMod.replaySettings.showRecordingIndicator() && ConnectionEventHandler.isRecording()) {
|
if(!ReplayHandler.isInReplay() && ReplayMod.replaySettings.showRecordingIndicator() && ConnectionEventHandler.isRecording()) {
|
||||||
|
|||||||
@@ -307,39 +307,6 @@ public class MinecraftTicker {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
|
||||||
while(mc.gameSettings.keyBindAttack.isPressed()) {
|
|
||||||
if(mc != null)
|
|
||||||
try {
|
|
||||||
clickMouse.invoke(mc);
|
|
||||||
} catch(Exception e) {
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
while(mc.gameSettings.keyBindUseItem.isPressed()) {
|
|
||||||
if(mc != null)
|
|
||||||
try {
|
|
||||||
rightClickMouse.invoke(mc);
|
|
||||||
} catch(Exception e) {
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
while(mc.gameSettings.keyBindPickBlock.isPressed()) {
|
|
||||||
if(mc != null)
|
|
||||||
try {
|
|
||||||
middleClickMouse.invoke(mc);
|
|
||||||
} catch(Exception e) {
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if(mc.gameSettings.keyBindUseItem.isKeyDown() && (Integer) rightClickDelayTimer.get(mc) == 0 && !mc.thePlayer.isUsingItem()) {
|
|
||||||
if(mc != null)
|
|
||||||
try {
|
|
||||||
rightClickMouse.invoke(mc);
|
|
||||||
} catch(Exception e) {
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if(mc != null)
|
if(mc != null)
|
||||||
|
|||||||
@@ -6,7 +6,6 @@ import eu.crushedpixel.replaymod.entities.CameraEntity;
|
|||||||
import eu.crushedpixel.replaymod.holders.*;
|
import eu.crushedpixel.replaymod.holders.*;
|
||||||
import io.netty.channel.embedded.EmbeddedChannel;
|
import io.netty.channel.embedded.EmbeddedChannel;
|
||||||
import net.minecraft.client.Minecraft;
|
import net.minecraft.client.Minecraft;
|
||||||
import net.minecraft.client.gui.GuiScreen;
|
|
||||||
import net.minecraft.client.network.NetHandlerPlayClient;
|
import net.minecraft.client.network.NetHandlerPlayClient;
|
||||||
import net.minecraft.entity.Entity;
|
import net.minecraft.entity.Entity;
|
||||||
import net.minecraft.network.EnumPacketDirection;
|
import net.minecraft.network.EnumPacketDirection;
|
||||||
@@ -250,14 +249,16 @@ public class ReplayHandler {
|
|||||||
mc.ingameGUI.getChatGUI().clearChatMessages();
|
mc.ingameGUI.getChatGUI().clearChatMessages();
|
||||||
resetKeyframes();
|
resetKeyframes();
|
||||||
|
|
||||||
ReplayMod.replaySender.terminateReplay();
|
if(ReplayMod.replaySender != null) {
|
||||||
|
ReplayMod.replaySender.terminateReplay();
|
||||||
|
}
|
||||||
|
|
||||||
if(channel != null) {
|
if(channel != null) {
|
||||||
channel.close();
|
channel.close();
|
||||||
}
|
}
|
||||||
|
|
||||||
networkManager = new NetworkManager(EnumPacketDirection.CLIENTBOUND);
|
networkManager = new NetworkManager(EnumPacketDirection.CLIENTBOUND);
|
||||||
INetHandlerPlayClient pc = new NetHandlerPlayClient(mc, (GuiScreen) 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 OpenEmbeddedChannel(networkManager);
|
||||||
@@ -284,7 +285,7 @@ public class ReplayHandler {
|
|||||||
}
|
}
|
||||||
|
|
||||||
networkManager = new NetworkManager(EnumPacketDirection.CLIENTBOUND);
|
networkManager = new NetworkManager(EnumPacketDirection.CLIENTBOUND);
|
||||||
INetHandlerPlayClient pc = new NetHandlerPlayClient(mc, (GuiScreen) 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);
|
||||||
|
|
||||||
EmbeddedChannel channel = new OpenEmbeddedChannel(networkManager);
|
EmbeddedChannel channel = new OpenEmbeddedChannel(networkManager);
|
||||||
|
|||||||
Reference in New Issue
Block a user