From e22fca08622a9d837caada64bf21ce614f66ed1b Mon Sep 17 00:00:00 2001 From: CrushedPixel Date: Sat, 25 Apr 2015 17:48:48 +0200 Subject: [PATCH] Removed "Null returned as hitResult" error message from log --- .../eu/crushedpixel/replaymod/ReplayMod.java | 1 + .../replaymod/events/GuiReplayOverlay.java | 8 +++++ .../replaymod/events/MinecraftTicker.java | 33 ------------------- .../events/TickAndRenderListener.java | 8 ++--- .../replaymod/replay/ReplayHandler.java | 9 ++--- 5 files changed, 18 insertions(+), 41 deletions(-) diff --git a/src/main/java/eu/crushedpixel/replaymod/ReplayMod.java b/src/main/java/eu/crushedpixel/replaymod/ReplayMod.java index 17b64ae8..0734f4fb 100755 --- a/src/main/java/eu/crushedpixel/replaymod/ReplayMod.java +++ b/src/main/java/eu/crushedpixel/replaymod/ReplayMod.java @@ -80,6 +80,7 @@ public class ReplayMod { MinecraftForge.EVENT_BUS.register(new GuiEventHandler()); FMLCommonHandler.instance().bus().register(new KeyInputHandler()); + MinecraftForge.EVENT_BUS.register(new MouseInputHandler()); recordingHandler = new RecordingHandler(); FMLCommonHandler.instance().bus().register(recordingHandler); diff --git a/src/main/java/eu/crushedpixel/replaymod/events/GuiReplayOverlay.java b/src/main/java/eu/crushedpixel/replaymod/events/GuiReplayOverlay.java index ae3dad7a..6b94abad 100755 --- a/src/main/java/eu/crushedpixel/replaymod/events/GuiReplayOverlay.java +++ b/src/main/java/eu/crushedpixel/replaymod/events/GuiReplayOverlay.java @@ -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 public void renderRecordingIndicator(RenderGameOverlayEvent.Text event) { if(!ReplayHandler.isInReplay() && ReplayMod.replaySettings.showRecordingIndicator() && ConnectionEventHandler.isRecording()) { diff --git a/src/main/java/eu/crushedpixel/replaymod/events/MinecraftTicker.java b/src/main/java/eu/crushedpixel/replaymod/events/MinecraftTicker.java index 4ca24331..4bd9bc5e 100755 --- a/src/main/java/eu/crushedpixel/replaymod/events/MinecraftTicker.java +++ b/src/main/java/eu/crushedpixel/replaymod/events/MinecraftTicker.java @@ -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) diff --git a/src/main/java/eu/crushedpixel/replaymod/events/TickAndRenderListener.java b/src/main/java/eu/crushedpixel/replaymod/events/TickAndRenderListener.java index 1fcf84d2..c39f40a6 100644 --- a/src/main/java/eu/crushedpixel/replaymod/events/TickAndRenderListener.java +++ b/src/main/java/eu/crushedpixel/replaymod/events/TickAndRenderListener.java @@ -86,18 +86,18 @@ public class TickAndRenderListener { isGamePaused.set(mc, false); } } - + @SubscribeEvent public void tick(TickEvent event) { if(!ReplayHandler.isInReplay()) return; /* - if(Keyboard.getEventKeyState() && Keyboard.isKeyDown(Keyboard.KEY_F1) - && ReplayHandler.isInPath() && !ReplayProcess.isVideoRecording() + if(Keyboard.getEventKeyState() && Keyboard.isKeyDown(Keyboard.KEY_F1) + && ReplayHandler.isInPath() && !ReplayProcess.isVideoRecording() && mc.currentScreen instanceof GuiMouseInput && !f1Down) { mc.gameSettings.hideGUI = !mc.gameSettings.hideGUI; } - + f1Down = Keyboard.isKeyDown(Keyboard.KEY_F1) && Keyboard.getEventKeyState(); */ diff --git a/src/main/java/eu/crushedpixel/replaymod/replay/ReplayHandler.java b/src/main/java/eu/crushedpixel/replaymod/replay/ReplayHandler.java index 59165db2..96727e81 100755 --- a/src/main/java/eu/crushedpixel/replaymod/replay/ReplayHandler.java +++ b/src/main/java/eu/crushedpixel/replaymod/replay/ReplayHandler.java @@ -6,7 +6,6 @@ import eu.crushedpixel.replaymod.entities.CameraEntity; import eu.crushedpixel.replaymod.holders.*; import io.netty.channel.embedded.EmbeddedChannel; import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.network.NetHandlerPlayClient; import net.minecraft.entity.Entity; import net.minecraft.network.EnumPacketDirection; @@ -250,14 +249,16 @@ public class ReplayHandler { mc.ingameGUI.getChatGUI().clearChatMessages(); resetKeyframes(); - ReplayMod.replaySender.terminateReplay(); + if(ReplayMod.replaySender != null) { + ReplayMod.replaySender.terminateReplay(); + } if(channel != null) { channel.close(); } 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); channel = new OpenEmbeddedChannel(networkManager); @@ -284,7 +285,7 @@ public class ReplayHandler { } 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); EmbeddedChannel channel = new OpenEmbeddedChannel(networkManager);