Merge branch 'mc-1.16.3' into release-2.4.5

build.gradle.kts

@@ -178,7 +178,7 @@ val doRelease by tasks.registering {
 defaultTasks("shadowJar")
 
 preprocess {
-    "1.16.2"(11602, "yarn") {
+    "1.16.3"(11603, "yarn") {
         "1.16.1"(11601, "yarn") {
             "1.15.2"(11502, "yarn") {
                 "1.14.4"(11404, "yarn", file("versions/mapping-fabric-1.15.2-1.14.4.txt")) {

settings.gradle.kts

@@ -29,7 +29,7 @@ val jGuiVersions = listOf(
         "1.14.4",
         "1.15.2",
         "1.16.1",
-        "1.16.2"
+        "1.16.3"
 )
 val replayModVersions = listOf(
         "1.7.10",
@@ -46,7 +46,7 @@ val replayModVersions = listOf(
         "1.14.4",
         "1.15.2",
         "1.16.1",
-        "1.16.2"
+        "1.16.3"
 )
 
 include(":jGui")

src/main/java/com/replaymod/render/mixin/MixinEntityRenderer.java

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

src/main/java/com/replaymod/replay/FullReplaySender.java

@@ -624,13 +624,15 @@ public class FullReplaySender extends ChannelDuplexHandler implements ReplaySend
                     //#endif
                     false,
                     //#if MC>=11600
-                    packet.method_29443(),
+                    //#if MC>=11603
-                    //#if MC>=11602
+                    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()

src/main/java/com/replaymod/replay/camera/CameraEntity.java

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

versions/common.gradle

@@ -225,25 +225,25 @@ dependencies {
                 11404: '1.14.4',
                 11502: '1.15.2',
                 11601: '1.16.1',
-                11602: '1.16.2',
+                11603: '1.16.3',
         ][mcVersion]
         mappings 'net.fabricmc:yarn:' + [
                 11404: '1.14.4+build.16',
                 11502: '1.15.2+build.14',
                 11601: '1.16.1+build.17:v2',
-                11602: '1.16.2+build.1:v2',
+                11603: '1.16.3+build.1:v2',
         ][mcVersion]
         modCompile 'net.fabricmc:fabric-loader:' + [
                 11404: '0.7.8+build.189',
                 11502: '0.7.8+build.189',
                 11601: '0.8.8+build.202',
-                11602: '0.9.1+build.205',
+                11603: '0.9.1+build.205',
         ][mcVersion]
         def fabricApiVersion = [
                 11404: '0.4.3+build.247-1.14',
                 11502: '0.5.1+build.294-1.15',
                 11601: '0.14.0+build.371-1.16',
-                11602: '0.17.1+build.394-1.16',
+                11603: '0.17.1+build.394-1.16',
         ][mcVersion]
         def fabricApiModules = [
                 "api-base",
@@ -295,7 +295,7 @@ dependencies {
 
     shadow 'com.github.ReplayMod.JavaBlend:2.79.0:a0696f8'
 
-    shadow "com.github.ReplayMod:ReplayStudio:bc8baba", shadeExclusions
+    shadow "com.github.ReplayMod:ReplayStudio:2773270", shadeExclusions
 
     implementation(jGui){
         transitive = false // FG 1.2 puts all MC deps into the compile configuration and we don't want to shade those

versions/mainProject

@@ -1 +1 @@
-1.16.2
+1.16.3