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

Removed "Null returned as hitResult" error message from log

Browse Source
This commit is contained in:
CrushedPixel
2015-04-25 17:48:48 +02:00
parent 0003f040ed
commit e22fca0862
5 changed files with 18 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/eu/crushedpixel/replaymod/ReplayMod.java
View File

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

8
src/main/java/eu/crushedpixel/replaymod/events/GuiReplayOverlay.java
View File

@@ -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()) {

33
src/main/java/eu/crushedpixel/replaymod/events/MinecraftTicker.java
View File

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

8
src/main/java/eu/crushedpixel/replaymod/events/TickAndRenderListener.java
View File

@@ -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();
*/

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

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