From 54d0bafa12935dd9bee1909526722a8f68dc7232 Mon Sep 17 00:00:00 2001 From: Ben Staddon Date: Tue, 9 Jul 2019 03:46:50 +0100 Subject: [PATCH] Pass tick counter to custom render handlers (#5744) --- .../net/minecraft/client/renderer/GameRenderer.java.patch | 2 +- .../net/minecraft/client/renderer/WorldRenderer.java.patch | 2 +- src/main/java/net/minecraftforge/client/CloudRenderer.java | 2 +- src/main/java/net/minecraftforge/client/IRenderHandler.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/patches/minecraft/net/minecraft/client/renderer/GameRenderer.java.patch b/patches/minecraft/net/minecraft/client/renderer/GameRenderer.java.patch index 687fd1256b..62a9d001a4 100644 --- a/patches/minecraft/net/minecraft/client/renderer/GameRenderer.java.patch +++ b/patches/minecraft/net/minecraft/client/renderer/GameRenderer.java.patch @@ -138,7 +138,7 @@ protected void func_78474_d(float p_78474_1_) { + net.minecraftforge.client.IRenderHandler renderer = this.field_78531_r.field_71441_e.func_201675_m().getWeatherRenderer(); + if (renderer != null) { -+ renderer.render(p_78474_1_, this.field_78531_r.field_71441_e, field_78531_r); ++ renderer.render(this.field_78529_t, p_78474_1_, this.field_78531_r.field_71441_e, this.field_78531_r); + return; + } float f = this.field_78531_r.field_71441_e.func_72867_j(p_78474_1_); diff --git a/patches/minecraft/net/minecraft/client/renderer/WorldRenderer.java.patch b/patches/minecraft/net/minecraft/client/renderer/WorldRenderer.java.patch index d89c0ea18d..8897bd6808 100644 --- a/patches/minecraft/net/minecraft/client/renderer/WorldRenderer.java.patch +++ b/patches/minecraft/net/minecraft/client/renderer/WorldRenderer.java.patch @@ -110,7 +110,7 @@ public void func_195465_a(float p_195465_1_) { + net.minecraftforge.client.IRenderHandler renderer = this.field_72769_h.func_201675_m().getSkyRenderer(); + if (renderer != null) { -+ renderer.render(p_195465_1_, field_72769_h, field_72777_q); ++ renderer.render(this.field_72773_u, p_195465_1_, this.field_72769_h, this.field_72777_q); + return; + } if (this.field_72777_q.field_71441_e.field_73011_w.func_186058_p() == DimensionType.THE_END) { diff --git a/src/main/java/net/minecraftforge/client/CloudRenderer.java b/src/main/java/net/minecraftforge/client/CloudRenderer.java index 763be1e0da..a20dda00c6 100644 --- a/src/main/java/net/minecraftforge/client/CloudRenderer.java +++ b/src/main/java/net/minecraftforge/client/CloudRenderer.java @@ -483,7 +483,7 @@ public class CloudRenderer implements ISelectiveResourceReloadListener IRenderHandler renderer = world.dimension.getCloudRenderer(); if (renderer != null) { - renderer.render(partialTicks, world, client); + renderer.render(cloudTicks, partialTicks, world, client); return true; } return getCloudRenderer().render(cloudTicks, partialTicks); diff --git a/src/main/java/net/minecraftforge/client/IRenderHandler.java b/src/main/java/net/minecraftforge/client/IRenderHandler.java index 53a6416f47..b19ebe5156 100644 --- a/src/main/java/net/minecraftforge/client/IRenderHandler.java +++ b/src/main/java/net/minecraftforge/client/IRenderHandler.java @@ -28,5 +28,5 @@ import net.minecraftforge.api.distmarker.OnlyIn; public interface IRenderHandler { @OnlyIn(Dist.CLIENT) - public abstract void render(float partialTicks, WorldClient world, Minecraft mc); + void render(int ticks, float partialTicks, WorldClient world, Minecraft mc); }