Update patchwork-events-rendering (#221)

Co-authored-by: Glitch <[email protected]>

Author: stairman06

patchwork-events-rendering/build.gradle

@@ -1,4 +1,4 @@
-archivesBaseName = "patchwork-client-colors"
+archivesBaseName = "patchwork-events-rendering"
 version = getSubprojectVersion(project, "0.3.3")
 
 dependencies {

patchwork-events-rendering/src/main/java/net/minecraftforge/client/event/ColorHandlerEvent.java

@@ -27,6 +27,7 @@
 /**
  * Use these events to register block/item
  * color handlers at the appropriate time.
+ * TODO: This is supposed to implement IModBusEvent, which is not yet implemented
  */
 public abstract class ColorHandlerEvent extends Event {
 	public static class Block extends ColorHandlerEvent {

patchwork-events-rendering/src/main/java/net/minecraftforge/client/event/DrawBlockHighlightEvent.java renamed to patchwork-events-rendering/src/main/java/net/minecraftforge/client/event/DrawHighlightEvent.java

@@ -21,6 +21,8 @@
 
 import net.minecraftforge.eventbus.api.Event;
 
+import net.minecraft.client.render.VertexConsumerProvider;
+import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.client.render.Camera;
 import net.minecraft.client.render.WorldRenderer;
 import net.minecraft.util.hit.BlockHitResult;
@@ -31,20 +33,21 @@
  * An event called whenever the selection highlight around blocks is about to be rendered.
  * Canceling this event stops the selection highlight from being rendered.
  */
-//TODO: in 1.15 rename to DrawHighlightEvent
-public class DrawBlockHighlightEvent extends Event {
+public class DrawHighlightEvent extends Event {
 	private final WorldRenderer context;
 	private final Camera info;
 	private final HitResult target;
-	private final int subID;
 	private final float partialTicks;
+	private final MatrixStack matrix;
+	private final VertexConsumerProvider buffers;
 
-	public DrawBlockHighlightEvent(WorldRenderer context, Camera info, HitResult target, int subID, float partialTicks) {
+	public DrawHighlightEvent(WorldRenderer context, Camera info, HitResult target, float partialTicks, MatrixStack matrix, VertexConsumerProvider buffers) {
 		this.context = context;
 		this.info = info;
 		this.target = target;
-		this.subID = subID;
 		this.partialTicks = partialTicks;
+		this.matrix = matrix;
+		this.buffers = buffers;
 	}
 
 	public WorldRenderer getContext() {
@@ -59,45 +62,54 @@ public HitResult getTarget() {
 		return target;
 	}
 
-	public int getSubID() {
-		return subID;
-	}
-
 	public float getPartialTicks() {
 		return partialTicks;
 	}
 
-	@Override
-	public boolean isCancelable() {
-		return true;
+	public MatrixStack getMatrix() {
+		return matrix;
+	}
+
+	public VertexConsumerProvider getBuffers() {
+		return buffers;
 	}
 
 	/**
 	 * A variant of the DrawHighlightEvent only called when a block is highlighted.
 	 */
-	public static class HighlightBlock extends DrawBlockHighlightEvent {
-		public HighlightBlock(WorldRenderer context, Camera info, HitResult target, int subID, float partialTicks) {
-			super(context, info, target, subID, partialTicks);
+	public static class HighlightBlock extends DrawHighlightEvent {
+		public HighlightBlock(WorldRenderer context, Camera info, HitResult target, float partialTicks, MatrixStack matrix, VertexConsumerProvider buffers) {
+			super(context, info, target, partialTicks, matrix, buffers);
 		}
 
 		@Override
 		public BlockHitResult getTarget() {
 			return (BlockHitResult) super.target;
 		}
+
+		@Override
+		public boolean isCancelable() {
+			return true;
+		}
 	}
 
 	/**
 	 * A variant of the DrawHighlightEvent only called when an entity is highlighted.
 	 * Canceling this event has no effect.
 	 */
-	public static class HighlightEntity extends DrawBlockHighlightEvent {
-		public HighlightEntity(WorldRenderer context, Camera info, HitResult target, int subID, float partialTicks) {
-			super(context, info, target, subID, partialTicks);
+	public static class HighlightEntity extends DrawHighlightEvent {
+		public HighlightEntity(WorldRenderer context, Camera info, HitResult target, float partialTicks, MatrixStack matrix, VertexConsumerProvider buffers) {
+			super(context, info, target, partialTicks, matrix, buffers);
 		}
 
 		@Override
 		public EntityHitResult getTarget() {
 			return (EntityHitResult) super.target;
 		}
+
+		@Override
+		public boolean isCancelable() {
+			return true;
+		}
 	}
 }

patchwork-events-rendering/src/main/java/net/minecraftforge/client/event/RenderHandEvent.java

@@ -19,33 +19,93 @@
 
 package net.minecraftforge.client.event;
 
+import javax.annotation.Nonnull;
+
 import net.minecraftforge.eventbus.api.Event;
 
-import net.minecraft.client.render.WorldRenderer;
+import net.minecraft.client.render.VertexConsumerProvider;
+import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.Hand;
 
 /**
- * This event is fired on {@link net.minecraftforge.common.MinecraftForge#EVENT_BUS}
- * before both hands are rendered.
- * Canceling this event prevents either hand from being rendered,
- * and prevents {@link RenderSpecificHandEvent} from firing.
+ * This event is fired on the {@link net.minecraftforge.common.MinecraftForge#EVENT_BUS}
+ * whenever a hand is rendered in first person.
+ * Canceling the event causes the hand to not render.
  */
 public class RenderHandEvent extends Event {
-	private final WorldRenderer context;
+	private final Hand hand;
+	private final MatrixStack mat;
+	private final VertexConsumerProvider buffers;
+	private final int light;
 	private final float partialTicks;
+	private final float interpolatedPitch;
+	private final float swingProgress;
+	private final float equipProgress;
+	@Nonnull
+	private final ItemStack stack;
 
-	public RenderHandEvent(WorldRenderer context, float partialTicks) {
-		this.context = context;
+	public RenderHandEvent(Hand hand, MatrixStack mat, VertexConsumerProvider buffers, int light, float partialTicks, float interpolatedPitch, float swingProgress, float equipProgress, @Nonnull ItemStack stack) {
+		this.hand = hand;
+		this.mat = mat;
+		this.buffers = buffers;
+		this.light = light;
 		this.partialTicks = partialTicks;
+		this.interpolatedPitch = interpolatedPitch;
+		this.swingProgress = swingProgress;
+		this.equipProgress = equipProgress;
+		this.stack = stack;
+	}
+
+	public Hand getHand() {
+		return hand;
+	}
+
+	public MatrixStack getMatrixStack() {
+		return mat;
+	}
+
+	public VertexConsumerProvider getBuffers() {
+		return buffers;
 	}
 
-	public WorldRenderer getContext() {
-		return context;
+	public int getLight() {
+		return light;
 	}
 
 	public float getPartialTicks() {
 		return partialTicks;
 	}
 
+	/**
+	 * @return The interpolated pitch of the player entity
+	 */
+	public float getInterpolatedPitch() {
+		return interpolatedPitch;
+	}
+
+	/**
+	 * @return The swing progress of the hand being rendered
+	 */
+	public float getSwingProgress() {
+		return swingProgress;
+	}
+
+	/**
+	 * @return The progress of the equip animation. 1.0 is fully equipped.
+	 */
+	public float getEquipProgress() {
+		return equipProgress;
+	}
+
+	/**
+	 * @return The ItemStack to be rendered
+	 */
+	@Nonnull
+	public ItemStack getItemStack() {
+		return stack;
+	}
+
 	@Override
 	public boolean isCancelable() {
 		return true;

patchwork-events-rendering/src/main/java/net/minecraftforge/client/event/RenderSpecificHandEvent.java

@@ -19,24 +19,42 @@
 
 package net.minecraftforge.client.event;
 
-import net.minecraftforge.eventbus.api.Event;
-
+import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.util.math.Matrix4f;
 import net.minecraft.client.render.WorldRenderer;
 
-public class RenderWorldLastEvent extends Event {
+public class RenderWorldLastEvent extends net.minecraftforge.eventbus.api.Event {
 	private final WorldRenderer context;
+	private final MatrixStack mat;
 	private final float partialTicks;
+	private final Matrix4f projectionMatrix;
+	private final long finishTimeNano;
 
-	public RenderWorldLastEvent(WorldRenderer context, float partialTicks) {
+	public RenderWorldLastEvent(WorldRenderer context, MatrixStack mat, float partialTicks, Matrix4f projectionMatrix, long finishTimeNano) {
 		this.context = context;
+		this.mat = mat;
 		this.partialTicks = partialTicks;
+		this.projectionMatrix = projectionMatrix;
+		this.finishTimeNano = finishTimeNano;
 	}
 
 	public WorldRenderer getContext() {
 		return context;
 	}
 
+	public MatrixStack getMatrixStack() {
+		return mat;
+	}
+
 	public float getPartialTicks() {
 		return partialTicks;
 	}
+
+	public Matrix4f getProjectionMatrix() {
+		return projectionMatrix;
+	}
+
+	public long getFinishTimeNano() {
+		return finishTimeNano;
+	}
 }

patchwork-events-rendering/src/main/java/net/minecraftforge/client/event/RenderWorldLastEvent.java

@@ -26,6 +26,7 @@
 import net.minecraft.client.texture.SpriteAtlasTexture;
 import net.minecraft.util.Identifier;
 
+// TODO: This is supposed to implement IModBusEvent, which is not yet implemented
 public class TextureStitchEvent extends Event {
 	private final SpriteAtlasTexture map;