Add DrawBlockHighlightEvent(DrawHighlightEvent) (#116)

* Add DrawBlockHighlightEvent(DrawHighlightEvent)

* Update RenderEvents.java

Author: rikka0w0

patchwork-events-rendering/build.gradle

@@ -1,2 +1,6 @@
 archivesBaseName = "patchwork-client-colors"
 version = getSubprojectVersion(project, "0.1.0")
+
+dependencies {
+	compile project(path: ':patchwork-fml', configuration: 'dev')
+}

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

@@ -0,0 +1,103 @@
+/*
+ * Minecraft Forge, Patchwork Project
+ * Copyright (c) 2016-2020, 2019-2020
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation version 2.1
+ * of the License.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+package net.minecraftforge.client.event;
+
+import net.minecraftforge.eventbus.api.Event;
+
+import net.minecraft.client.render.Camera;
+import net.minecraft.client.render.WorldRenderer;
+import net.minecraft.util.hit.BlockHitResult;
+import net.minecraft.util.hit.EntityHitResult;
+import net.minecraft.util.hit.HitResult;
+
+/**
+ * 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 {
+	private final WorldRenderer context;
+	private final Camera info;
+	private final HitResult target;
+	private final int subID;
+	private final float partialTicks;
+
+	public DrawBlockHighlightEvent(WorldRenderer context, Camera info, HitResult target, int subID, float partialTicks) {
+		this.context = context;
+		this.info = info;
+		this.target = target;
+		this.subID = subID;
+		this.partialTicks = partialTicks;
+	}
+
+	public WorldRenderer getContext() {
+		return context;
+	}
+
+	public Camera getInfo() {
+		return info;
+	}
+
+	public HitResult getTarget() {
+		return target;
+	}
+
+	public int getSubID() {
+		return subID;
+	}
+
+	public float getPartialTicks() {
+		return partialTicks;
+	}
+
+	@Override
+	public boolean isCancelable() {
+		return true;
+	}
+
+	/**
+	 * 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);
+		}
+
+		@Override
+		public BlockHitResult getTarget() {
+			return (BlockHitResult) super.target;
+		}
+	}
+
+	/**
+	 * 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);
+		}
+
+		@Override
+		public EntityHitResult getTarget() {
+			return (EntityHitResult) super.target;
+		}
+	}
+}

patchwork-events-rendering/src/main/java/net/patchworkmc/impl/event/render/RenderEvents.java

@@ -23,13 +23,20 @@
 import java.util.function.Consumer;
 
 import net.minecraftforge.client.event.ColorHandlerEvent;
+import net.minecraftforge.client.event.DrawBlockHighlightEvent;
 import net.minecraftforge.client.event.TextureStitchEvent;
+import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.eventbus.api.Event;
 
 import net.minecraft.client.color.block.BlockColors;
 import net.minecraft.client.color.item.ItemColors;
+import net.minecraft.client.render.Camera;
+import net.minecraft.client.render.WorldRenderer;
 import net.minecraft.client.texture.SpriteAtlasTexture;
 import net.minecraft.util.Identifier;
+import net.minecraft.util.hit.BlockHitResult;
+import net.minecraft.util.hit.EntityHitResult;
+import net.minecraft.util.hit.HitResult;
 
 public class RenderEvents {
 	private static Consumer<Event> eventDispatcher;
@@ -53,4 +60,21 @@ public static void onTextureStitchPre(SpriteAtlasTexture spriteAtlasTexture, Set
 	public static void onTextureStitchPost(SpriteAtlasTexture spriteAtlasTexture) {
 		eventDispatcher.accept(new TextureStitchEvent.Post(spriteAtlasTexture));
 	}
+
+	/**
+	 * Called by ForgeHooksClient and MixinWorldRenderer.
+	 * @return true if the bounding box rendering is cancelled.
+	 */
+	public static boolean onDrawHighlightEvent(WorldRenderer context, Camera info, HitResult target, int subID, float partialTicks) {
+		switch (target.getType()) {
+		case BLOCK:
+			if (!(target instanceof BlockHitResult)) return false;
+			return MinecraftForge.EVENT_BUS.post(new DrawBlockHighlightEvent.HighlightBlock(context, info, target, subID, partialTicks));
+		case ENTITY:
+			if (!(target instanceof EntityHitResult)) return false;
+			return MinecraftForge.EVENT_BUS.post(new DrawBlockHighlightEvent.HighlightEntity(context, info, target, subID, partialTicks));
+		default:
+			return MinecraftForge.EVENT_BUS.post(new DrawBlockHighlightEvent(context, info, target, subID, partialTicks));
+		}
+	}
 }

patchwork-events-rendering/src/main/java/net/patchworkmc/mixin/event/render/MixinGameRenderer.java

@@ -0,0 +1,48 @@
+/*
+ * Minecraft Forge, Patchwork Project
+ * Copyright (c) 2016-2020, 2019-2020
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation version 2.1
+ * of the License.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+package net.patchworkmc.mixin.event.render;
+
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Redirect;
+
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.render.Camera;
+import net.minecraft.client.render.GameRenderer;
+import net.minecraft.client.render.WorldRenderer;
+import net.minecraft.util.hit.HitResult;
+
+import net.patchworkmc.impl.event.render.RenderEvents;
+
+@Mixin(GameRenderer.class)
+public abstract class MixinGameRenderer {
+	@Redirect(
+			method = "renderCenter", at = @At(value = "INVOKE", ordinal = 0,
+			target = "net/minecraft/client/render/WorldRenderer.drawHighlightedBlockOutline(Lnet/minecraft/client/render/Camera;Lnet/minecraft/util/hit/HitResult;I)V"
+			)
+	)
+	private void patchwork_renderCenter_drawHighlightedBlockOutline(WorldRenderer worldRenderer, Camera camera, HitResult hit, int renderPass, float partialTicks, long nanoTime) {
+		MinecraftClient client = ((GameRenderer) (Object) this).getClient();
+
+		if (!RenderEvents.onDrawHighlightEvent(worldRenderer, camera, hit, 0, partialTicks)) {
+			worldRenderer.drawHighlightedBlockOutline(camera, client.crosshairTarget, 0);
+		}
+	}
+}

patchwork-events-rendering/src/main/resources/patchwork-events-rendering.mixins.json

@@ -5,6 +5,7 @@
   "client": [
     "MixinItemColors",
     "MixinBlockColors",
+    "MixinGameRenderer",
     "MixinSpriteAtlasTexture"
   ],
   "injectors": {