Auto-cancel vanilla block outline of highlighted blocks

KubeJS-Mods · Feb 1, 2025 · ab3f88d · ab3f88d
1 parent 02ae957
commit ab3f88d
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 23 deletions.
diff --git a/src/main/java/dev/latvian/mods/kubejs/client/highlight/HighlightKubeEvent.java b/src/main/java/dev/latvian/mods/kubejs/client/highlight/HighlightKubeEvent.java
@@ -74,7 +74,7 @@ public void addBlocks(BlockPos from, BlockPos to, KubeColor color) {
 	}
 
 	public void addTargetBlock(KubeColor color) {
-		if (Minecraft.getInstance().hitResult instanceof BlockHitResult hit && hit.getType() == HitResult.Type.BLOCK) {
+		if (mc.hitResult instanceof BlockHitResult hit && hit.getType() == HitResult.Type.BLOCK) {
 			addBlock(hit.getBlockPos(), color);
 		}
 	}
@@ -121,10 +121,6 @@ public void addTargetEntity(KubeColor color) {
 		}
 	}
 
-	public void cancelBlockHighlight() {
-		renderer.cancelBlockHighlight = true;
-	}
-
 	public void addTarget(KubeColor color) {
 		if (mc.hitResult instanceof EntityHitResult hit) {
 			addEntity(hit.getEntity(), color);

diff --git a/src/main/java/dev/latvian/mods/kubejs/client/highlight/HighlightRenderer.java b/src/main/java/dev/latvian/mods/kubejs/client/highlight/HighlightRenderer.java
@@ -15,8 +15,10 @@
 import dev.latvian.mods.kubejs.plugin.builtin.event.ClientEvents;
 import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
 import it.unimi.dsi.fastutil.ints.IntOpenHashSet;
-import it.unimi.dsi.fastutil.longs.Long2IntOpenHashMap;
-import it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap;
+import it.unimi.dsi.fastutil.longs.Long2IntLinkedOpenHashMap;
+import it.unimi.dsi.fastutil.longs.Long2IntMap;
+import it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap;
+import it.unimi.dsi.fastutil.objects.Reference2IntMap;
 import net.minecraft.CrashReport;
 import net.minecraft.CrashReportCategory;
 import net.minecraft.ReportedException;
@@ -62,15 +64,9 @@
 
 public class HighlightRenderer {
 	public enum Mode {
-		NONE(false),
-		SCREEN(false),
-		WORLD(true);
-
-		public final boolean cancelBlockHighlight;
-
-		Mode(boolean cancelBlockHighlight) {
-			this.cancelBlockHighlight = cancelBlockHighlight;
-		}
+		NONE,
+		SCREEN,
+		WORLD
 	}
 
 	public record ShaderChain(PostChain postChain, RenderTarget renderInput, RenderTarget mcDepthInput, RenderTarget renderOutput, MutableBoolean renderAnything) {
@@ -218,8 +214,8 @@ public VertexConsumer setNormal(float f, float g, float h) {
 	public ShaderInstance highlightShader;
 
 	public final Set<Slot> hoveredSlots = new HashSet<>();
-	public final Reference2IntOpenHashMap<Entity> highlightedEntities = new Reference2IntOpenHashMap<>(0);
-	public final Long2IntOpenHashMap highlightedBlocks = new Long2IntOpenHashMap(0);
+	public final Reference2IntMap<Entity> highlightedEntities = new Reference2IntLinkedOpenHashMap<>(0);
+	public final Long2IntMap highlightedBlocks = new Long2IntLinkedOpenHashMap(0);
 	public final IntOpenHashSet uniqueColors = new IntOpenHashSet(0);
 	public boolean cancelBlockHighlight;
 
@@ -258,7 +254,7 @@ public void tickPre(Minecraft mc) {
 		highlightedEntities.clear();
 		highlightedBlocks.clear();
 		uniqueColors.clear();
-		cancelBlockHighlight = mode.cancelBlockHighlight;
+		cancelBlockHighlight = false;
 
 		if (mc.level != null && mc.player != null) {
 			var event = new HighlightKubeEvent(mc, this);
@@ -267,6 +263,10 @@ public void tickPre(Minecraft mc) {
 			if (mode == Mode.WORLD) {
 				event.addTarget(color);
 			}
+
+			if (mc.hitResult instanceof BlockHitResult hit && hit.getType() == HitResult.Type.BLOCK && highlightedBlocks.containsKey(hit.getBlockPos().asLong())) {
+				cancelBlockHighlight = true;
+			}
 		}
 	}
 
@@ -568,9 +568,5 @@ public void screen(Minecraft mc, GuiGraphics graphics, AbstractContainerScreen<?
 	}
 
 	public void hudPostDraw(Minecraft mc, GuiGraphics graphics, float delta) {
-		if (worldChain != null) {
-			graphics.flush();
-			// worldChain.draw(mc, delta);
-		}
 	}
 }