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

Complete all currently actionable 1.13.2 FIXMEs

Browse Source
This commit is contained in:
Jonas Herzig
2019-03-10 22:41:14 +01:00
parent e9ca1bb47e
commit 0f3a6253e0
23 changed files with 313 additions and 289 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/replaymod/replay/FullReplaySender.java
View File

@@ -582,7 +582,7 @@ public class FullReplaySender extends ChannelDuplexHandler implements ReplaySend
if (!file.exists()) {
IOUtils.copy(replayFile.getResourcePack(hash).get(), new FileOutputStream(file));
}
// FIXME setServerResourcePack(mc.getResourcePackRepository(), file);
setServerResourcePack(file);
}
}
return null;

7
src/main/java/com/replaymod/replay/ReplayHandler.java
View File

@@ -690,10 +690,9 @@ public class ReplayHandler {
//#if MC>=11300
if (entity instanceof EntityLivingBase) {
EntityLivingBase e = (EntityLivingBase) entity;
// FIXME
// e.setPosition(e.otherPlayerMPX, e.otherPlayerMPY, e.otherPlayerMPZ);
// e.rotationYaw = (float) e.otherPlayerMPYaw;
// e.rotationPitch = (float) e.otherPlayerMPPitch;
e.setPosition(e.interpTargetX, e.interpTargetY, e.interpTargetZ);
e.rotationYaw = (float) e.interpTargetYaw;
e.rotationPitch = (float) e.interpTargetPitch;
}
//#else
//$$ if (entity instanceof EntityOtherPlayerMP) {

33
src/main/java/com/replaymod/replay/camera/CameraEntity.java
View File

@@ -10,14 +10,12 @@ import com.replaymod.replay.events.ReplayChatMessageEvent;
import com.replaymod.replaystudio.util.Location;
import lombok.Getter;
import lombok.Setter;
import net.minecraft.block.material.Material;
import net.minecraft.client.Minecraft;
import net.minecraft.client.entity.AbstractClientPlayer;
import net.minecraft.client.network.NetHandlerPlayClient;
import net.minecraft.client.settings.KeyBinding;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLiving;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.item.EntityItemFrame;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.util.ResourceLocation;
@@ -29,6 +27,9 @@ import net.minecraftforge.common.MinecraftForge;
//#if MC>=11300
import net.minecraft.util.math.RayTraceFluidMode;
//#else
//$$ import net.minecraft.block.material.Material;
//$$ import net.minecraft.entity.EntityLivingBase;
//#endif
//#if MC>=10904
@@ -289,12 +290,12 @@ public class CameraEntity
return falseUnlessSpectating(Entity::isEntityInsideOpaqueBlock); // Make sure no suffocation overlay is rendered
}
/* FIXME
@Override
public boolean isInsideOfMaterial(Material materialIn) {
return falseUnlessSpectating(e -> e.isInsideOfMaterial(materialIn)); // Make sure no overlays are rendered
}
*/
//#if MC<11300
//$$ @Override
//$$ public boolean isInsideOfMaterial(Material materialIn) {
//$$ return falseUnlessSpectating(e -> e.isInsideOfMaterial(materialIn)); // Make sure no overlays are rendered
//$$ }
//#endif
//#if MC>=10800
@Override
@@ -473,13 +474,13 @@ public class CameraEntity
//$$ }
//#endif
/* FIXME
@Override
public void openGui(Object mod, int modGuiId, World world, int x, int y, int z) {
// Do not open any block GUIs for the camera entities
// Note: Vanilla GUIs are filtered out on a packet level, this only applies to mod GUIs
}
*/
//#if MC<11300
//$$ @Override
//$$ public void openGui(Object mod, int modGuiId, World world, int x, int y, int z) {
//$$ // Do not open any block GUIs for the camera entities
//$$ // Note: Vanilla GUIs are filtered out on a packet level, this only applies to mod GUIs
//$$ }
//#endif
@Override
//#if MC>=11300
@@ -618,14 +619,12 @@ public class CameraEntity
lastHandRendered = player;
//#if MC>=10904
/* FIXME needs AT
mc.entityRenderer.itemRenderer.prevEquippedProgressMainHand = 1;
mc.entityRenderer.itemRenderer.prevEquippedProgressOffHand = 1;
mc.entityRenderer.itemRenderer.equippedProgressMainHand = 1;
mc.entityRenderer.itemRenderer.equippedProgressOffHand = 1;
mc.entityRenderer.itemRenderer.itemStackMainHand = player.getItemStackFromSlot(EntityEquipmentSlot.MAINHAND);
mc.entityRenderer.itemRenderer.itemStackOffHand = player.getItemStackFromSlot(EntityEquipmentSlot.OFFHAND);
*/
//#else
//$$ mc.entityRenderer.itemRenderer.prevEquippedProgress = 1;
//$$ mc.entityRenderer.itemRenderer.equippedProgress = 1;