PreRenderListener, deprecates some of RenderListener

Mumfrey
1 parent 1012613a
Showing 8 changed files with 138 additions and 4 deletions
debug/obfuscation.properties
java/client/com/mumfrey/liteloader/PreRenderListener.java
java/client/com/mumfrey/liteloader/RenderListener.java
java/client/com/mumfrey/liteloader/client/CallbackProxyClient.java
java/client/com/mumfrey/liteloader/client/LiteLoaderEventBrokerClient.java
java/client/com/mumfrey/liteloader/client/transformers/LiteLoaderEventInjectionTransformer.java
java/common/com/mumfrey/liteloader/core/runtime/Methods.java
java/common/com/mumfrey/liteloader/core/runtime/Obf.java
@@ -63,4 +63,7 @@ func_175087_a=handleAnimation
 func_147345_a=processPlayerDigging
 func_71190_q=updateTimeLightAndEntities
 func_180031_a=checkThreadAndEnqueue
-func_147347_a=processPlayer
 \ No newline at end of file
+func_147347_a=processPlayer
+func_174976_a=renderSky
+func_180437_a=renderCloudsCheck
+func_78468_a=setupFog
 \ No newline at end of file
+package com.mumfrey.liteloader;
+
+import net.minecraft.client.renderer.RenderGlobal;
+
+/**
+ * Render callbacks that get called before certain render events
+ * 
+ * @author Adam Mummery-Smith
+ */
+public interface PreRenderListener extends LiteMod
+{
+	/**
+	 * Called immediately before rendering of the world (including the sky) is started.
+	 * 
+	 * @param partialTicks
+	 */
+	public abstract void onRenderWorld(float partialTicks);
+	
+	/**
+	 * Called <b>after</b> the world camera transform is initialised, may be called more than once per frame if anaglyph is enabled
+	 * 
+	 * @param partialTicks
+	 * @param pass
+	 * @param timeSlice
+	 */
+	public abstract void onSetupCameraTransform(float partialTicks, int pass, long timeSlice);
+	
+	/**
+	 * Called when the sky is rendered, may be called more than once per frame if anaglyph is enabled 
+	 * 
+	 * @param partialTicks
+	 * @param pass
+	 */
+	public abstract void onRenderSky(float partialTicks, int pass);
+	
+	/**
+	 * Called immediately before the clouds are rendered, may be called more than once per frame if anaglyph is enabled
+	 * 
+	 * @param renderGlobal
+	 * @param partialTicks
+	 * @param pass
+	 */
+	public abstract void onRenderClouds(float partialTicks, int pass, RenderGlobal renderGlobal);
+
+	/**
+	 * Called before the terrain is rendered, may be called more than once per frame if anaglyph is enabled
+	 * 
+	 * @param partialTicks
+	 * @param pass
+	 */
+	public abstract void onRenderTerrain(float partialTicks, int pass);
+}
@@ -23,7 +23,10 @@ public interface RenderListener extends LiteMod
 	/**
 	 * Called when the world is rendered
+	 * 
+	 * @deprecated Use PreRenderListener::onRenderWorld(F)V instead
 	 */
+	@Deprecated
 	public abstract void onRenderWorld();
 	/**
@@ -8,6 +8,7 @@ import net.minecraft.client.entity.EntityPlayerSP;
 import net.minecraft.client.gui.GuiIngame;
 import net.minecraft.client.renderer.EntityRenderer;
 import net.minecraft.client.renderer.OpenGlHelper;
+import net.minecraft.client.renderer.RenderGlobal;
 import net.minecraft.client.renderer.entity.Render;
 import net.minecraft.client.renderer.entity.RenderManager;
 import net.minecraft.client.shader.Framebuffer;
@@ -81,7 +82,7 @@ public abstract class CallbackProxyClient extends CallbackProxyCommon
 	public static void onSetupCameraTransform(EventInfo<EntityRenderer> e, int pass, float partialTicks, long timeSlice)
 	{
-		CallbackProxyClient.clientEventBroker.onSetupCameraTransform(partialTicks, timeSlice);
+		CallbackProxyClient.clientEventBroker.onSetupCameraTransform(pass, partialTicks, timeSlice);
 	}
 	public static void postRenderEntities(EventInfo<EntityRenderer> e, int pass, float partialTicks, long timeSlice)
@@ -169,6 +170,21 @@ public abstract class CallbackProxyClient extends CallbackProxyCommon
 		CallbackProxyClient.clientEventBroker.onRenderWorld(partialTicks, timeSlice);
 	}
+	public static void onRenderSky(EventInfo<EntityRenderer> e, int pass, float partialTicks, long timeSlice)
+	{
+		CallbackProxyClient.clientEventBroker.onRenderSky(partialTicks, pass, timeSlice);
+	}
+	
+	public static void onRenderClouds(EventInfo<EntityRenderer> e, RenderGlobal renderGlobalIn, float partialTicks, int pass)
+	{
+		CallbackProxyClient.clientEventBroker.onRenderClouds(partialTicks, pass, renderGlobalIn);
+	}
+	
+	public static void onRenderTerrain(EventInfo<EntityRenderer> e, int pass, float partialTicks, long timeSlice)
+	{
+		CallbackProxyClient.clientEventBroker.onRenderTerrain(partialTicks, pass, timeSlice);
+	}
+	
 	public static void onSaveScreenshot(ReturnEventInfo<ScreenShotHelper, IChatComponent> e, File gameDir, String name, int width, int height, Framebuffer fbo)
 	{
 		CallbackProxyClient.clientEventBroker.onScreenshot(e, name, width, height, fbo);
@@ -4,6 +4,7 @@ import net.minecraft.client.Minecraft;
 import net.minecraft.client.entity.EntityPlayerSP;
 import net.minecraft.client.gui.GuiNewChat;
 import net.minecraft.client.gui.ScaledResolution;
+import net.minecraft.client.renderer.RenderGlobal;
 import net.minecraft.client.renderer.entity.Render;
 import net.minecraft.client.renderer.entity.RenderManager;
 import net.minecraft.client.resources.IResourceManager;
@@ -67,6 +68,7 @@ public class LiteLoaderEventBrokerClient extends LiteLoaderEventBroker&lt;Minecraft
 	private FastIterableDeque<Tickable>             tickListeners;
 	private FastIterableDeque<GameLoopListener>     loopListeners         = new HandlerList<GameLoopListener>(GameLoopListener.class);
 	private FastIterableDeque<RenderListener>       renderListeners       = new HandlerList<RenderListener>(RenderListener.class);
+	private FastIterableDeque<PreRenderListener>    preRenderListeners    = new HandlerList<PreRenderListener>(PreRenderListener.class);
 	private FastIterableDeque<PostRenderListener>   postRenderListeners   = new HandlerList<PostRenderListener>(PostRenderListener.class);
 	private FastIterableDeque<HUDRenderListener>    hudRenderListeners    = new HandlerList<HUDRenderListener>(HUDRenderListener.class);
 	private FastIterableDeque<ChatRenderListener>   chatRenderListeners   = new HandlerList<ChatRenderListener>(ChatRenderListener.class);
@@ -111,6 +113,7 @@ public class LiteLoaderEventBrokerClient extends LiteLoaderEventBroker&lt;Minecraft
 		delegate.registerInterface(Tickable.class);
 		delegate.registerInterface(GameLoopListener.class);
 		delegate.registerInterface(RenderListener.class);
+		delegate.registerInterface(PreRenderListener.class);
 		delegate.registerInterface(PostRenderListener.class);
 		delegate.registerInterface(HUDRenderListener.class);
 		delegate.registerInterface(ChatRenderListener.class);
@@ -164,6 +167,14 @@ public class LiteLoaderEventBrokerClient extends LiteLoaderEventBroker&lt;Minecraft
 	}
 	/**
+	 * @param preRenderListener
+	 */
+	public void addPreRenderListener(PreRenderListener preRenderListener)
+	{
+		this.preRenderListeners.add(preRenderListener);
+	}
+	
+	/**
 	 * @param postRenderListener
 	 */
 	public void addPostRenderListener(PostRenderListener postRenderListener)
@@ -320,12 +331,14 @@ public class LiteLoaderEventBrokerClient extends LiteLoaderEventBroker&lt;Minecraft
 	/**
 	 * Called immediately after the world/camera transform is initialised
 	 * 
+	 * @param pass
 	 * @param timeSlice 
 	 * @param partialTicks 
 	 */
-	void onSetupCameraTransform(float partialTicks, long timeSlice)
+	void onSetupCameraTransform(int pass, float partialTicks, long timeSlice)
 	{
 		this.renderListeners.all().onSetupCameraTransform();
+		this.preRenderListeners.all().onSetupCameraTransform(partialTicks, pass, timeSlice);
 	}
 	/**
@@ -466,10 +479,41 @@ public class LiteLoaderEventBrokerClient extends LiteLoaderEventBroker&lt;Minecraft
 	 */
 	void onRenderWorld(float partialTicks, long timeSlice)
 	{
+		this.preRenderListeners.all().onRenderWorld(partialTicks);
 		this.renderListeners.all().onRenderWorld();
 	}
 	/**
+	 * @param partialTicks
+	 * @param pass
+	 * @param timeSlice
+	 */
+	void onRenderSky(float partialTicks, int pass, long timeSlice)
+	{
+		this.preRenderListeners.all().onRenderSky(partialTicks, pass);
+	}
+	
+	/**
+	 * @param partialTicks
+	 * @param pass
+	 * @param renderGlobal
+	 */
+	void onRenderClouds(float partialTicks, int pass, RenderGlobal renderGlobal)
+	{
+		this.preRenderListeners.all().onRenderClouds(partialTicks, pass, renderGlobal);
+	}
+	
+	/**
+	 * @param partialTicks
+	 * @param pass
+	 * @param timeSlice
+	 */
+	void onRenderTerrain(float partialTicks, int pass, long timeSlice)
+	{
+		this.preRenderListeners.all().onRenderTerrain(partialTicks, pass);
+	}
+
+	/**
 	 * @param e
 	 * @param name
 	 * @param width
@@ -38,6 +38,9 @@ public class LiteLoaderEventInjectionTransformer extends LiteLoaderEventTransfor
 		Event renderFBO                        = Event.getOrCreate("renderFBO",                    false);
 		Event postRenderFBO                    = Event.getOrCreate("postRenderFBO",                false);
 		Event onRenderWorld                    = Event.getOrCreate("onRenderWorld",                false);
+		Event onRenderSky                      = Event.getOrCreate("onRenderSky",                  false);
+		Event onRenderClouds                   = Event.getOrCreate("onRenderClouds",               false);
+		Event onRenderTerrain                  = Event.getOrCreate("onRenderTerrain",              false);
 		Event onTimerUpdate                    = Event.getOrCreate("onTimerUpdate",                false);
 		Event onRender                         = Event.getOrCreate("onRender",                     false);
 		Event newTick                          = Event.getOrCreate("newTick",                      false);
@@ -73,6 +76,9 @@ public class LiteLoaderEventInjectionTransformer extends LiteLoaderEventTransfor
 		InjectionPoint beforeStopRealsmFetcher = new BeforeInvoke(realmsStopFetcher).setCaptureLocals(true);
 		InjectionPoint beforeTickProfiler      = new BeforeStringInvoke("tick",         startSection);
 		InjectionPoint beforeCenterProfiler    = new BeforeStringInvoke("center",       startSection);
+		InjectionPoint beforeSkyProfiler       = new BeforeStringInvoke("sky",          endStartSection);
+		InjectionPoint beforeCloudsProfiler    = new BeforeStringInvoke("clouds",       endStartSection);
+		InjectionPoint beforeTerrainProfiler   = new BeforeStringInvoke("terrain",      endStartSection);
 		InjectionPoint beforeRenderProfiler    = new BeforeStringInvoke("gameRenderer", endStartSection);
 		InjectionPoint beforeFrustumProfiler   = new BeforeStringInvoke("frustum",      endStartSection);
 		InjectionPoint beforeParticlesProfiler = new BeforeStringInvoke("litParticles", endStartSection);
@@ -85,6 +91,9 @@ public class LiteLoaderEventInjectionTransformer extends LiteLoaderEventTransfor
 		this.add(renderFBO,                    framebufferRenderExt,       (beforeBindFBOTex),        "renderFBO");
 		this.add(postRenderFBO,                runGameLoop,           after(beforeFBORender),         "postRenderFBO");
 		this.add(onRenderWorld,                renderWorld,                (beforeCenterProfiler),    "onRenderWorld");
+		this.add(onRenderSky,                  renderWorldPass,            (beforeSkyProfiler),       "onRenderSky");
+		this.add(onRenderClouds,               renderCloudsCheck,          (beforeCloudsProfiler),    "onRenderClouds");
+		this.add(onRenderTerrain,              renderWorldPass,            (beforeTerrainProfiler),   "onRenderTerrain");
 		this.add(onTimerUpdate,                runGameLoop,                (beforeTickProfiler),      "onTimerUpdate");
 		this.add(onRender,                     runGameLoop,                (beforeRenderProfiler),    "onRender");
 		this.add(newTick,                      runTick,                    (methodHead),              "newTick");
@@ -50,6 +50,9 @@ public abstract class Methods
 	public static final MethodInfo serverJobs             = new MethodInfo(Obf.MinecraftServer,            Obf.updateTimeLightAndEntities,   Void.TYPE);
 	public static final MethodInfo checkThreadAndEnqueue  = new MethodInfo(Obf.PacketThreadUtil,           Obf.checkThreadAndEnqueue);
 	public static final MethodInfo processPlayer          = new MethodInfo(Obf.NetHandlerPlayServer,       Obf.processPlayer,                Void.TYPE, Packets.C03PacketPlayer);
+	public static final MethodInfo renderSky              = new MethodInfo(Obf.RenderGlobal,               Obf.renderSky,                    Void.TYPE, Float.TYPE, Integer.TYPE);
+	public static final MethodInfo renderCloudsCheck      = new MethodInfo(Obf.EntityRenderer,             Obf.renderCloudsCheck,            Void.TYPE, Obf.RenderGlobal, Float.TYPE, Integer.TYPE);
+	public static final MethodInfo setupFog               = new MethodInfo(Obf.EntityRenderer,             Obf.setupFog,                     Void.TYPE, Integer.TYPE, Float.TYPE);
 	// Profiler
 	public static final MethodInfo startSection           = new MethodInfo(Obf.Profiler,                   Obf.startSection,                 Void.TYPE, String.class);
@@ -79,6 +79,7 @@ public class Obf
 	public static final Obf                        World = new Obf("net.minecraft.world.World",                                  "aqu" );
 	public static final Obf                    ItemStack = new Obf("net.minecraft.item.ItemStack",                               "amj" );
 	public static final Obf             PacketThreadUtil = new Obf("net.minecraft.network.PacketThreadUtil",                     "ig"  );
+	public static final Obf                 RenderGlobal = new Obf("net.minecraft.client.renderer.RenderGlobal",                 "ckn" );
 	// Fields
 	// -----------------------------------------------------------------------------------------
@@ -152,7 +153,10 @@ public class Obf
 	public static final Obf   updateTimeLightAndEntities = new Obf("func_71190_q",                                               "z"   );
 	public static final Obf        checkThreadAndEnqueue = new Obf("func_180031_a",                                              "a"   );
 	public static final Obf                processPlayer = new Obf("func_147347_a",                                              "a"   );
-
+	public static final Obf                    renderSky = new Obf("func_174976_a",                                              "a"   );
+	public static final Obf            renderCloudsCheck = new Obf("func_180437_a",                                              "a"   );
+	public static final Obf                     setupFog = new Obf("func_78468_a",                                               "a"   );
+ 
 	public static final int MCP = 0;
 	public static final int SRG = 1;
 	public static final int OBF = 2;