Avoid using deprecated API, use new render events.

Potentially fixed some rendering issues, too.

Author: fnuecke

src/main/java/li/cil/oc2/client/ClientSetup.java

@@ -39,7 +39,6 @@ public static void handleSetupEvent(final FMLClientSetupEvent event) {
         BusInterfaceNameRenderer.initialize();
 
         BlockEntityRenderers.register(BlockEntities.COMPUTER.get(), ComputerRenderer::new);
-        BlockEntityRenderers.register(BlockEntities.NETWORK_CONNECTOR.get(), NetworkConnectorRenderer::new);
         BlockEntityRenderers.register(BlockEntities.DISK_DRIVE.get(), DiskDriveRenderer::new);
         BlockEntityRenderers.register(BlockEntities.CHARGER.get(), ChargerRenderer::new);
         BlockEntityRenderers.register(BlockEntities.PROJECTOR.get(), ProjectorRenderer::new);

src/main/java/li/cil/oc2/client/renderer/BusInterfaceNameRenderer.java

@@ -20,7 +20,7 @@
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.phys.BlockHitResult;
-import net.minecraftforge.client.event.RenderLevelLastEvent;
+import net.minecraftforge.client.event.RenderLevelStageEvent;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 
@@ -34,7 +34,11 @@ public static void initialize() {
     }
 
     @SubscribeEvent
-    public void handleRenderLastEvent(final RenderLevelLastEvent event) {
+    public void handleRenderLastEvent(final RenderLevelStageEvent event) {
+        if (event.getStage() != RenderLevelStageEvent.Stage.AFTER_TRANSLUCENT_BLOCKS) {
+            return;
+        }
+
         final Minecraft mc = Minecraft.getInstance();
         final Player player = mc.player;
         if (player == null) {

src/main/java/li/cil/oc2/client/renderer/NetworkCableRenderer.java

@@ -8,19 +8,19 @@
 import com.mojang.math.Vector3f;
 import li.cil.oc2.api.API;
 import li.cil.oc2.common.blockentity.NetworkConnectorBlockEntity;
-import net.minecraft.client.Camera;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.LightTexture;
 import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.client.renderer.RenderType;
 import net.minecraft.client.renderer.culling.Frustum;
 import net.minecraft.core.BlockPos;
 import net.minecraft.util.Mth;
+import net.minecraft.world.entity.Entity;
 import net.minecraft.world.level.*;
 import net.minecraft.world.phys.AABB;
 import net.minecraft.world.phys.Vec3;
 import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.client.event.RenderLevelLastEvent;
+import net.minecraftforge.client.event.RenderLevelStageEvent;
 import net.minecraftforge.event.world.ChunkEvent;
 import net.minecraftforge.event.world.WorldEvent;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
@@ -112,14 +112,14 @@ public static void handleWorldUnloadEvent(final WorldEvent.Unload event) {
     }
 
     @SubscribeEvent
-    public static void handleRenderWorld(final RenderLevelLastEvent event) {
-        validateConnectors();
-        validatePairs();
-
-        if (Minecraft.useShaderTransparency()) {
+    public static void handleRenderWorld(final RenderLevelStageEvent event) {
+        if (event.getStage() != RenderLevelStageEvent.Stage.AFTER_CUTOUT_BLOCKS) {
             return;
         }
 
+        validateConnectors();
+        validatePairs();
+
         if (connections.isEmpty()) {
             return;
         }
@@ -132,8 +132,7 @@ public static void handleRenderWorld(final RenderLevelLastEvent event) {
 
         final PoseStack stack = event.getPoseStack();
 
-        final Camera activeRenderInfo = client.gameRenderer.getMainCamera();
-        final Vec3 eye = activeRenderInfo.getPosition();
+        final Vec3 eye = event.getCamera().getPosition();
 
         final Frustum frustum = new Frustum(stack.last().pose(), event.getProjectionMatrix());
         frustum.prepare(eye.x, eye.y, eye.z);

src/main/java/li/cil/oc2/client/renderer/ProjectorDepthRenderer.java

@@ -35,12 +35,13 @@
 import net.minecraft.client.renderer.texture.DynamicTexture;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
+import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.phys.HitResult;
 import net.minecraft.world.phys.Vec3;
 import net.minecraftforge.client.event.EntityViewRenderEvent;
-import net.minecraftforge.client.event.RenderLevelLastEvent;
+import net.minecraftforge.client.event.RenderLevelStageEvent;
 import net.minecraftforge.client.event.RenderNameplateEvent;
 import net.minecraftforge.event.TickEvent;
 import net.minecraftforge.eventbus.api.Event;
@@ -66,7 +67,7 @@ public final class ProjectorDepthRenderer {
     private static final DynamicTexture[] PROJECTOR_COLOR_TARGETS = new DynamicTexture[ModShaders.MAX_PROJECTORS];
     private static final Matrix4f[] PROJECTOR_CAMERA_MATRICES = new Matrix4f[ModShaders.MAX_PROJECTORS];
     private static final Camera PROJECTOR_DEPTH_CAMERA = new Camera();
-    private static final DepthOnlyRenderTarget MAIN_CAMERA_DEPTH = new DepthOnlyRenderTarget(MainTarget.DEFAULT_WIDTH, MainTarget.DEFAULT_HEIGHT);
+    private static DepthOnlyRenderTarget MAIN_CAMERA_DEPTH = new DepthOnlyRenderTarget(MainTarget.DEFAULT_WIDTH, MainTarget.DEFAULT_HEIGHT);
     private static final float PROJECTOR_FORWARD_SHIFT = 7 / 16f; // From center of projector block.
     private static final float PROJECTOR_NEAR = 0.5f - PROJECTOR_FORWARD_SHIFT;
     private static final float PROJECTOR_FAR = ProjectorBlockEntity.MAX_RENDER_DISTANCE;
@@ -86,6 +87,8 @@ public final class ProjectorDepthRenderer {
     private static boolean isRenderingProjectorDepth;
     private static HitResult hitResultBak;
     private static boolean entityShadowsBak;
+    private static Entity minecraftCameraEntityBak;
+    private static Camera gameRendererMainCameraBak;
 
     private static void handleProjectorNoLongerRendering(final RemovalNotification<ProjectorBlockEntity, RenderInfo> notification) {
         final ProjectorBlockEntity projector = notification.getKey();
@@ -140,7 +143,7 @@ public static boolean isIsRenderingProjectorDepth() {
      * method to grab the current depth buffer. This is necessary, because the depth buffer may be messed up by other
      * render passes when using the "Fabulous!" graphics mode.
      * <p>
-     * Called before {@link #handleRenderLevelLast(RenderLevelLastEvent)} every frame.
+     * Called before {@link #renderProjectors(RenderLevelStageEvent)} every frame.
      */
     public static void captureMainCameraDepth() {
         final RenderTarget mainRenderTarget = Minecraft.getInstance().getMainRenderTarget();
@@ -149,6 +152,9 @@ public static void captureMainCameraDepth() {
         }
         if (mainRenderTarget.isStencilEnabled()) {
             MAIN_CAMERA_DEPTH.enableStencil();
+        } else if (MAIN_CAMERA_DEPTH.isStencilEnabled()) {
+            MAIN_CAMERA_DEPTH.destroyBuffers();
+            MAIN_CAMERA_DEPTH = new DepthOnlyRenderTarget(mainRenderTarget.width, mainRenderTarget.height);
         }
         MAIN_CAMERA_DEPTH.copyDepthFrom(mainRenderTarget);
         mainRenderTarget.bindWrite(false);
@@ -159,7 +165,14 @@ public static void captureMainCameraDepth() {
      * {@link #addProjector(ProjectorBlockEntity)} this frame.
      */
     @SubscribeEvent
-    public static void handleRenderLevelLast(final RenderLevelLastEvent event) {
+    public static void renderProjectors(final RenderLevelStageEvent event) {
+        if (event.getStage() != RenderLevelStageEvent.Stage.AFTER_PARTICLES) {
+            return;
+        }
+        if (isIsRenderingProjectorDepth()) {
+            return;
+        }
+
         if (VISIBLE_PROJECTORS.isEmpty()) {
             return;
         }
@@ -178,7 +191,7 @@ public static void handleRenderLevelLast(final RenderLevelLastEvent event) {
             });
 
             final int projectorCount = Math.min(VISIBLE_PROJECTORS.size(), ModShaders.MAX_PROJECTORS);
-            renderProjectorDepths(minecraft, level, player, event.getPartialTick(), event.getStartNanos(), projectorCount);
+            renderProjectorDepths(minecraft, level, event.getPartialTick(), projectorCount);
             renderProjectorColors(minecraft, event.getPoseStack().last().pose(), event.getProjectionMatrix(), projectorCount);
         } finally {
             VISIBLE_PROJECTORS.clear();
@@ -221,10 +234,10 @@ public static void handleClientTick(final TickEvent.ClientTickEvent event) {
      * bre rendered. The output is the list of depth buffers, MVP matrices that were used to render them, and the
      * associated color texture for the projector.
      */
-    private static void renderProjectorDepths(final Minecraft minecraft, final ClientLevel level, final Player player,
-                                              final float partialTicks, final long startNanos,
-                                              final int projectorCount) {
-        prepareDepthBufferRendering(minecraft, level);
+    private static void renderProjectorDepths(final Minecraft minecraft, final ClientLevel level,
+                                              final float partialTicks, final int projectorCount) {
+        final Vec3 mainCameraPosition = minecraft.gameRenderer.getMainCamera().getPosition();
+        prepareDepthBufferRendering(minecraft, level, partialTicks);
         try {
             final PoseStack viewModelStack = new PoseStack();
             for (int projectorIndex = 0; projectorIndex < projectorCount; projectorIndex++) {
@@ -239,22 +252,22 @@ private static void renderProjectorDepths(final Minecraft minecraft, final Clien
                 RenderSystem.setProjectionMatrix(DEPTH_CAMERA_PROJECTION_MATRIX);
                 setupViewModelMatrix(viewModelStack);
 
-                storeProjectorMatrix(projectorIndex, minecraft, projectorPos, viewModelStack);
+                storeProjectorMatrix(projectorIndex, projectorPos, mainCameraPosition, viewModelStack);
 
                 bindProjectorDepthRenderTarget(projectorIndex, minecraft);
 
-                renderProjectorDepthBuffer(minecraft, partialTicks, startNanos, viewModelStack);
+                renderProjectorDepthBuffer(minecraft, partialTicks, viewModelStack);
 
                 storeProjectorColorBuffer(projectorIndex, projector);
 
                 projector.onRendering();
             }
         } finally {
-            finishDepthBufferRendering(minecraft, player);
+            finishDepthBufferRendering(minecraft);
         }
     }
 
-    private static void prepareDepthBufferRendering(final Minecraft minecraft, final ClientLevel level) {
+    private static void prepareDepthBufferRendering(final Minecraft minecraft, final ClientLevel level, final float partialTicks) {
         isRenderingProjectorDepth = true;
 
         // Suppresses hit outlines being rendered.
@@ -265,12 +278,15 @@ private static void prepareDepthBufferRendering(final Minecraft minecraft, final
         entityShadowsBak = minecraft.options.entityShadows;
         minecraft.options.entityShadows = false;
 
-        minecraft.setCameraEntity(ProjectorCameraEntity.get(level, Vec3.ZERO, 0));
+        minecraftCameraEntityBak = minecraft.getCameraEntity();
+        minecraft.setCameraEntity(ProjectorCameraEntity.get(level, Vec3.ZERO, partialTicks));
+        gameRendererMainCameraBak = minecraft.gameRenderer.mainCamera;
+        minecraft.gameRenderer.mainCamera = PROJECTOR_DEPTH_CAMERA;
 
         RenderSystem.backupProjectionMatrix();
     }
 
-    private static void finishDepthBufferRendering(final Minecraft minecraft, final Player player) {
+    private static void finishDepthBufferRendering(final Minecraft minecraft) {
         minecraft.hitResult = hitResultBak;
         minecraft.options.entityShadows = entityShadowsBak;
 
@@ -279,7 +295,8 @@ private static void finishDepthBufferRendering(final Minecraft minecraft, final
         ((MinecraftExt) minecraft).setMainRenderTargetOverride(null);
         minecraft.getMainRenderTarget().bindWrite(true);
 
-        minecraft.setCameraEntity(player);
+        minecraft.setCameraEntity(minecraftCameraEntityBak);
+        minecraft.gameRenderer.mainCamera = gameRendererMainCameraBak;
 
         isRenderingProjectorDepth = false;
     }
@@ -298,10 +315,7 @@ private static void setupViewModelMatrix(final PoseStack viewModelStack) {
         }
     }
 
-    private static void storeProjectorMatrix(final int projectorIndex, final Minecraft minecraft, final Vec3 projectorPos, final PoseStack viewModelStack) {
-        final Camera mainCamera = minecraft.gameRenderer.getMainCamera();
-        final Vec3 mainCameraPosition = mainCamera.getPosition();
-
+    private static void storeProjectorMatrix(final int projectorIndex, final Vec3 projectorPos, final Vec3 mainCameraPosition, final PoseStack viewModelStack) {
         // Save model-view-projection matrix for mapping in compositing shader. We use the position relative to the
         // main camera here, so that the main camera can sit at the origin. This avoids loss of precision.
         PROJECTOR_CAMERA_MATRICES[projectorIndex].load(DEPTH_CAMERA_PROJECTION_MATRIX);
@@ -321,7 +335,7 @@ private static void bindProjectorDepthRenderTarget(final int projectorIndex, fin
         ((MinecraftExt) minecraft).setMainRenderTargetOverride(projectorDepthTarget);
     }
 
-    private static void renderProjectorDepthBuffer(final Minecraft minecraft, final float partialTicks, final long startNanos, final PoseStack viewModelStack) {
+    private static void renderProjectorDepthBuffer(final Minecraft minecraft, final float partialTicks, final PoseStack viewModelStack) {
         final LevelRenderer levelRenderer = minecraft.levelRenderer;
         levelRenderer.prepareCullFrustum(
             viewModelStack,
@@ -331,7 +345,7 @@ private static void renderProjectorDepthBuffer(final Minecraft minecraft, final
         levelRenderer.renderLevel(
             viewModelStack,
             partialTicks,
-            startNanos,
+            /* startNanos */ 0,
             /* shouldRenderBlockOutline: */ false,
             PROJECTOR_DEPTH_CAMERA,
             minecraft.gameRenderer,
@@ -341,7 +355,7 @@ private static void renderProjectorDepthBuffer(final Minecraft minecraft, final
     }
 
     private static void storeProjectorColorBuffer(final int projectorIndex, final ProjectorBlockEntity projector) {
-        PROJECTOR_COLOR_TARGETS[projectorIndex] = getRenderInfo(projector).texture();
+        PROJECTOR_COLOR_TARGETS[projectorIndex] = getColorBuffer(projector);
     }
 
     /**
@@ -352,7 +366,6 @@ private static void storeProjectorColorBuffer(final int projectorIndex, final Pr
      */
     private static void renderProjectorColors(final Minecraft minecraft, final Matrix4f modelViewMatrix, final Matrix4f projectionMatrix, final int projectorCount) {
         prepareColorBufferRendering();
-
         try {
             prepareOrthographicRendering(minecraft);
 
@@ -439,15 +452,15 @@ private static Matrix4f getFrustumMatrix(final float near, final float far, fina
         });
     }
 
-    private static RenderInfo getRenderInfo(final ProjectorBlockEntity projector) {
+    private static DynamicTexture getColorBuffer(final ProjectorBlockEntity projector) {
         try {
             return RENDER_INFO.get(projector, () -> {
                 final DynamicTexture texture = new DynamicTexture(ProjectorDevice.WIDTH, ProjectorDevice.HEIGHT, false);
                 texture.upload();
                 final RenderInfo renderInfo = new RenderInfo(texture);
                 projector.setFrameConsumer(renderInfo);
                 return renderInfo;
-            });
+            }).texture();
         } catch (final ExecutionException e) {
             throw new RuntimeException(e);
         }

src/main/java/li/cil/oc2/client/renderer/blockentity/NetworkConnectorRenderer.java

@@ -1,2 +1,3 @@
 public net.minecraft.client.MouseHandler f_91520_ # mouseGrabbed
 public-f net.minecraft.world.entity.Entity m_142467_(Lnet/minecraft/world/entity/Entity$RemovalReason;)V # setRemoved
+public-f net.minecraft.client.renderer.GameRenderer f_109054_ # mainCamera

src/main/resources/META-INF/accesstransformer.cfg

@@ -17,7 +17,7 @@ This mod uses the Terminus Font under the Open Font License. The full license ca
 [[dependencies.oc2]]
 modId = "forge"
 mandatory = true
-versionRange = "[40.1.0,)"
+versionRange = "[40.1.68,)"
 ordering = "NONE"
 side = "BOTH"
 [[dependencies.oc2]]