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

Added and fixed basic saving of recording player

Browse Source
This commit is contained in:
Marius Metzger
2015-01-16 21:39:30 +01:00
parent 1afdd6df2b
commit 69a196fe74
9 changed files with 210 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -15,8 +15,10 @@ import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.client.settings.KeyBinding;
import net.minecraft.entity.Entity;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.client.GuiIngameForge;
import net.minecraftforge.client.event.MouseEvent;
import net.minecraftforge.client.event.RenderGameOverlayEvent;
import net.minecraftforge.client.event.RenderHandEvent;
import net.minecraftforge.client.event.RenderWorldLastEvent;
import net.minecraftforge.fml.client.FMLClientHandler;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
@@ -82,6 +84,13 @@ public class GuiReplayOverlay extends Gui {
} catch(Exception e) {}
}
@SubscribeEvent
public void renderHand(RenderHandEvent event) {
if(ReplayHandler.replayActive()) {
event.setCanceled(true);
}
}
@SubscribeEvent
public void tick(TickEvent event) {
if(!ReplayHandler.replayActive()) return;
@@ -114,7 +123,12 @@ public class GuiReplayOverlay extends Gui {
@SubscribeEvent
public void onRenderGui(RenderGameOverlayEvent.Post event) throws IllegalArgumentException, IllegalAccessException {
if(!ReplayHandler.replayActive()) return;
if(!ReplayHandler.replayActive()) {
GuiIngameForge.renderExperiance = true;
return;
}
GuiIngameForge.renderExperiance = false;
GL11.glEnable(GL11.GL_BLEND);
drawBlockOutline.set(Minecraft.getMinecraft().entityRenderer, false);
@@ -289,7 +303,10 @@ public class GuiReplayOverlay extends Gui {
Mouse.setCursorPosition(width/2, height/2);
}
speedSlider.drawButton(mc, mouseX, mouseY);
try {
speedSlider.drawButton(mc, mouseX, mouseY);
} catch(Exception e) {}
GlStateManager.resetColor();
Entity player = ReplayHandler.getCameraEntity();

81
src/main/java/eu/crushedpixel/replaymod/events/RecordingHandler.java
View File

@@ -26,86 +26,109 @@ import eu.crushedpixel.replaymod.recording.ConnectionEventHandler;
public class RecordingHandler {
private Minecraft mc = Minecraft.getMinecraft();
private int entityID = Integer.MAX_VALUE;
private int entityID = Integer.MIN_VALUE+9001;
@SubscribeEvent
public void onPlayerJoin(EntityJoinWorldEvent e) throws IOException {
if(e.entity != mc.thePlayer) return;
if(!ConnectionEventHandler.isRecording()) return;
EntityPlayer player = (EntityPlayer)e.entity;
S38PacketPlayerListItem ppli = new S38PacketPlayerListItem();
ByteBuf buf = Unpooled.buffer();
PacketBuffer pbuf = new PacketBuffer(buf);
pbuf.writeEnumValue(Action.ADD_PLAYER);
pbuf.writeVarIntToBuffer(1);
pbuf.writeUuid(e.entity.getUniqueID());
pbuf.writeString(player.getName());
pbuf.writeVarIntToBuffer(0);
pbuf.writeVarIntToBuffer(mc.playerController.getCurrentGameType().getID());
pbuf.writeVarIntToBuffer(0);
pbuf.writeBoolean(true);
pbuf.writeChatComponent(player.getDisplayName());
ppli.readPacketData(pbuf);
ConnectionEventHandler.insertPacket(ppli);
//Packet packet = new S0CPacketSpawnPlayer((EntityPlayer)e.entity);
Packet packet = new S0CPacketSpawnPlayer();
S0CPacketSpawnPlayer packet = new S0CPacketSpawnPlayer();
ByteBuf bb = Unpooled.buffer();
PacketBuffer pb = new PacketBuffer(bb);
pb.writeVarIntToBuffer(entityID);
//pb.writeUuid((e.entity).getUniqueID());
pb.writeUuid(e.entity.getUniqueID());
pb.writeInt(MathHelper.floor_double(e.entity.posX * 32.0D));
pb.writeInt(MathHelper.floor_double(e.entity.posY * 32.0D));
pb.writeInt(MathHelper.floor_double(e.entity.posZ * 32.0D));
pb.writeByte((byte)((int)(((EntityPlayer)e.entity).rotationYaw * 256.0F / 360.0F)));
pb.writeByte((byte)((int)(((EntityPlayer)e.entity).rotationPitch * 256.0F / 360.0F)));
ItemStack itemstack = ((EntityPlayer)e.entity).inventory.getCurrentItem();
pb.writeInt(itemstack == null ? 0 : Item.getIdFromItem(itemstack.getItem()));
((EntityPlayer)e.entity).getDataWatcher().writeTo(pb);
packet.readPacketData(pb);
ConnectionEventHandler.insertPacket(packet);
}
private Double lastX = null, lastY = null, lastZ = null;
public void resetLastPositions() {
lastX = lastY = lastZ = null;
}
@SubscribeEvent
public void onPlayerTick(PlayerTickEvent e) {
if(e.player != mc.thePlayer) return;
if(!ConnectionEventHandler.isRecording()) return;
boolean force = false;
if(lastX == null || lastY == null || lastZ == null) {
force = true;
lastX = e.player.posX;
lastY = e.player.posY;
lastZ = e.player.posZ;
}
double dx = e.player.prevPosX - e.player.posX;
double dy = e.player.prevPosY - e.player.posY;
double dz = e.player.prevPosZ - e.player.posZ;
double dx = e.player.posX - lastX;
double dy = e.player.posY - lastY;
double dz = e.player.posZ - lastZ;
Packet packet;
if(Math.abs(dx) > 4.0 || Math.abs(dy) > 4.0 || Math.abs(dz) > 4.0) {
packet = new S18PacketEntityTeleport(e.player);
lastX = e.player.posX;
lastY = e.player.posY;
lastZ = e.player.posZ;
Packet packet = null;
if(force || Math.abs(dx) > 4.0 || Math.abs(dy) > 4.0 || Math.abs(dz) > 4.0) {
int x = MathHelper.floor_double(e.player.posX * 32.0D);
int y = MathHelper.floor_double(e.player.posY * 32.0D);
int z = MathHelper.floor_double(e.player.posZ * 32.0D);
byte yaw = (byte)((int)(e.player.rotationYaw * 256.0F / 360.0F));
byte pitch = (byte)((int)(e.player.rotationPitch * 256.0F / 360.0F));
packet = new S18PacketEntityTeleport(entityID, x, y, z, yaw, pitch, e.player.onGround);
} else {
byte oldYaw = (byte)((int)(e.player.prevRotationYaw * 256.0F / 360.0F));
byte newYaw = (byte)((int)(e.player.rotationYaw * 256.0F / 360.0F));
byte oldPitch = (byte)((int)(e.player.prevRotationPitch * 256.0F / 360.0F));
byte newPitch = (byte)((int)(e.player.rotationPitch * 256.0F / 360.0F));
byte dPitch = (byte)(newPitch-oldPitch);
byte dYaw = (byte)(newYaw-oldYaw);
packet = new S17PacketEntityLookMove(entityID,
(byte)Math.round(dx*32), (byte)Math.round(dy*32), (byte)Math.round(dz*32),
dYaw, dPitch, e.player.onGround);
}
ConnectionEventHandler.insertPacket(packet);
if(packet != null) {
ConnectionEventHandler.insertPacket(packet);
}
}
}