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

Merge branch 'mc-1.16.3' into develop

Browse Source
This commit is contained in:
Jonas Herzig
2020-09-10 17:34:48 +02:00
parent 83690f4024 efd1cebff3
commit 3db25abe48
9 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/replaymod/render/mixin/MixinEntityRenderer.java
View File

@@ -38,7 +38,7 @@ import net.minecraft.client.render.WorldRenderer;
//#endif
//#if MC>=10904
import net.minecraft.world.RayTraceContext;
import net.minecraft.world.RaycastContext;
//#else
//$$ import net.minecraft.util.MovingObjectPosition;
//#endif

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

@@ -624,13 +624,15 @@ public class FullReplaySender extends ChannelDuplexHandler implements ReplaySend
//#endif
false,
//#if MC>=11600
packet.method_29443(),
//#if MC>=11602
//#if MC>=11603
packet.getDimensionIds(),
(net.minecraft.util.registry.DynamicRegistryManager.Impl) packet.getRegistryManager(),
packet.getDimensionType(),
//#else
//$$ packet.method_29443(),
//$$ (net.minecraft.util.registry.RegistryTracker.Modifiable) packet.getDimension(),
//$$ packet.method_29444(),
//#endif
packet.method_29444(),
packet.getDimensionId(),
//#else
//$$ packet.getDimension(),
@@ -639,7 +641,7 @@ public class FullReplaySender extends ChannelDuplexHandler implements ReplaySend
//#if MC<11600
//$$ packet.getGeneratorType(),
//#endif
packet.getChunkLoadDistance(),
packet.getViewDistance(),
packet.hasReducedDebugInfo()
//#if MC>=11500
, packet.showsDeathScreen()

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

@@ -481,8 +481,8 @@ public class CameraEntity
//#if MC>=11400
@Override
public HitResult rayTrace(double maxDistance, float tickDelta, boolean fluids) {
HitResult result = super.rayTrace(maxDistance, tickDelta, fluids);
public HitResult raycast(double maxDistance, float tickDelta, boolean fluids) {
HitResult result = super.raycast(maxDistance, tickDelta, fluids);
// Make sure we can never look at blocks (-> no outline)
if (result instanceof BlockHitResult) {