25w31a

src/main/java/carpet/mixins/ChunkMap_scarpetChunkCreationMixin.java

@@ -27,7 +27,7 @@ import net.minecraft.server.level.ChunkResult;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.server.level.ThreadedLevelLightEngine;
 import net.minecraft.server.level.TicketType;
-import net.minecraft.server.level.progress.ChunkProgressListener;
+
 import net.minecraft.util.thread.BlockableEventLoop;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.player.Player;
@@ -83,9 +83,9 @@ public abstract class ChunkMap_scarpetChunkCreationMixin implements ThreadedAnvi
     @Final
     private BlockableEventLoop<Runnable> mainThreadExecutor;
 
-    @Shadow
-    @Final
-    private ChunkProgressListener progressListener;
+    //@Shadow
+    //@Final
+    //private ChunkProgressListener progressListener;
 
     @Shadow
     @Final

src/main/java/carpet/mixins/LevelRenderer_fogOffMixin.java

@@ -2,13 +2,14 @@ package carpet.mixins;
 
 import carpet.CarpetSettings;
 import net.minecraft.client.renderer.DimensionSpecialEffects;
+import net.minecraft.client.renderer.GameRenderer;
 import net.minecraft.client.renderer.LevelRenderer;
 //import net.minecraft.world.dimension.Dimension;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Redirect;
 
-@Mixin(value = LevelRenderer.class, priority = 69420)
+@Mixin(value = GameRenderer.class, priority = 69420)
 public class LevelRenderer_fogOffMixin
 {
     @Redirect(method = "renderLevel", require = 0, expect = 0, at = @At(

src/main/java/carpet/mixins/LevelRenderer_scarpetRenderMixin.java

@@ -7,12 +7,13 @@ import com.mojang.blaze3d.framegraph.FrameGraphBuilder;
 import com.mojang.blaze3d.framegraph.FramePass;
 import net.minecraft.client.Camera;
 import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.LevelRenderState;
 import net.minecraft.client.renderer.LevelRenderer;
 import net.minecraft.client.renderer.LevelTargetBundle;
-import net.minecraft.client.renderer.LightTexture;
 import net.minecraft.client.renderer.RenderBuffers;
 import net.minecraft.client.renderer.blockentity.BlockEntityRenderDispatcher;
 import net.minecraft.client.renderer.entity.EntityRenderDispatcher;
+import net.minecraft.client.renderer.feature.FeatureRenderDispatcher;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
@@ -26,7 +27,7 @@ public class LevelRenderer_scarpetRenderMixin
     @Shadow @Final private LevelTargetBundle targets;
 
     @Inject(method = "<init>", at = @At("RETURN"))
-    private void addRenderers(Minecraft minecraft, EntityRenderDispatcher entityRenderDispatcher, BlockEntityRenderDispatcher blockEntityRenderDispatcher, RenderBuffers renderBuffers, CallbackInfo ci)
+    private void addRenderers(Minecraft minecraft, EntityRenderDispatcher entityRenderDispatcher, BlockEntityRenderDispatcher blockEntityRenderDispatcher, RenderBuffers renderBuffers, LevelRenderState levelRenderState, FeatureRenderDispatcher featureRenderDispatcher, CallbackInfo ci)
     {
         CarpetClient.shapes = new ShapesRenderer(minecraft);
     }

src/main/java/carpet/mixins/PistonHeadRenderer_movableBEMixin.java

@@ -24,7 +24,7 @@ public abstract class PistonHeadRenderer_movableBEMixin implements BlockEntityRe
     @Inject(method = "<init>", at = @At("TAIL"))
     private void onInitCM(BlockEntityRendererProvider.Context arguments, CallbackInfo ci)
     {
-        dispatcher = arguments.getBlockEntityRenderDispatcher();
+        dispatcher = arguments.blockEntityRenderDispatcher();
     }
 
     @Inject(method = "render", at = @At(value = "INVOKE",

src/main/java/carpet/mixins/PlayerList_fakePlayersMixin.java

@@ -18,6 +18,7 @@ import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.Redirect;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 import carpet.patches.NetHandlerPlayServerFake;
 import carpet.patches.EntityPlayerMPFake;
@@ -31,8 +32,9 @@ public abstract class PlayerList_fakePlayersMixin
     @Final
     private MinecraftServer server;
 
-    @Inject(method = "load", at = @At(value = "RETURN", shift = At.Shift.BEFORE))
-    private void fixStartingPos(ServerPlayer serverPlayer, ProblemReporter problemReporter, CallbackInfoReturnable<Optional<ValueInput>> cir)
+    // may need to be invoked in the configuration phase on prepareSpawn Task
+    @Inject(method = "placeNewPlayer", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/level/ServerPlayer;level()Lnet/minecraft/server/level/ServerLevel;"))
+    private void fixStartingPos(Connection connection, ServerPlayer serverPlayer, CommonListenerCookie commonListenerCookie, CallbackInfo ci)
     {
         if (serverPlayer instanceof EntityPlayerMPFake)
         {