From d449cccd170dd53a4b85df9c20fd7b36c3a24c9c Mon Sep 17 00:00:00 2001
From: olim <bobq4582@gmail.com>
Date: Thu, 18 Jul 2024 12:35:00 +0100
Subject: requested changes

---
 .../skyblock/dwarven/CrystalsChestHighlighter.java |  9 ++++----
 .../skyblocker/utils/render/RenderHelper.java      | 26 +---------------------
 2 files changed, 5 insertions(+), 30 deletions(-)

(limited to 'src/main/java')

diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsChestHighlighter.java b/src/main/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsChestHighlighter.java
index 8cd75428..cd51daa5 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsChestHighlighter.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsChestHighlighter.java
@@ -3,6 +3,7 @@ package de.hysky.skyblocker.skyblock.dwarven;
 import de.hysky.skyblocker.config.SkyblockerConfigManager;
 import de.hysky.skyblocker.utils.Utils;
 import de.hysky.skyblocker.utils.render.RenderHelper;
+import it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap;
 import net.fabricmc.fabric.api.client.message.v1.ClientReceiveMessageEvents;
 import net.fabricmc.fabric.api.client.networking.v1.ClientPlayConnectionEvents;
 import net.fabricmc.fabric.api.client.rendering.v1.WorldRenderContext;
@@ -21,9 +22,7 @@ import net.minecraft.util.math.Box;
 import net.minecraft.util.math.Vec3d;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 public class CrystalsChestHighlighter {
 
@@ -34,7 +33,7 @@ public class CrystalsChestHighlighter {
 
     private static int waitingForChest = 0;
     private static final List<BlockPos> activeChests = new ArrayList<>();
-    private static final Map<Vec3d, Long> activeParticles = new HashMap<>();
+    private static final Object2LongOpenHashMap<Vec3d> activeParticles = new Object2LongOpenHashMap<>();
     private static int currentLockCount = 0;
     private static int neededLockCount = 0;
 
@@ -113,11 +112,11 @@ public class CrystalsChestHighlighter {
         if (path.equals("entity.experience_orb.pickup") && packet.getPitch() == 1) {
             currentLockCount += 1;
             activeParticles.clear();
-        //lock pick fail sound
+            //lock pick fail sound
         } else if (path.equals("entity.villager.no")) {
             currentLockCount = 0;
             activeParticles.clear();
-        //lock pick finish sound
+            //lock pick finish sound
         } else if (path.equals("block.chest.open")) {
             //set the needed lock count to the current, so we know how many locks a chest has
             neededLockCount = currentLockCount;
diff --git a/src/main/java/de/hysky/skyblocker/utils/render/RenderHelper.java b/src/main/java/de/hysky/skyblocker/utils/render/RenderHelper.java
index 1106dee8..ad5811f1 100644
--- a/src/main/java/de/hysky/skyblocker/utils/render/RenderHelper.java
+++ b/src/main/java/de/hysky/skyblocker/utils/render/RenderHelper.java
@@ -119,31 +119,7 @@ public class RenderHelper {
      * This does not use renderer since renderer draws outline using debug lines with a fixed width.
      */
     public static void renderOutline(WorldRenderContext context, Box box, float[] colorComponents, float lineWidth, boolean throughWalls) {
-        if (FrustumUtils.isVisible(box)) {
-            MatrixStack matrices = context.matrixStack();
-            Vec3d camera = context.camera().getPos();
-            Tessellator tessellator = RenderSystem.renderThreadTesselator();
-
-            RenderSystem.setShader(GameRenderer::getRenderTypeLinesProgram);
-            RenderSystem.setShaderColor(1f, 1f, 1f, 1f);
-            RenderSystem.lineWidth(lineWidth);
-            RenderSystem.disableCull();
-            RenderSystem.enableDepthTest();
-            RenderSystem.depthFunc(throughWalls ? GL11.GL_ALWAYS : GL11.GL_LEQUAL);
-
-            matrices.push();
-            matrices.translate(-camera.getX(), -camera.getY(), -camera.getZ());
-
-            BufferBuilder buffer = tessellator.begin(DrawMode.LINES, VertexFormats.LINES);
-            WorldRenderer.drawBox(matrices, buffer, box, colorComponents[0], colorComponents[1], colorComponents[2], 1f);
-            BufferRenderer.drawWithGlobalProgram(buffer.end());
-
-            matrices.pop();
-            RenderSystem.lineWidth(1f);
-            RenderSystem.enableCull();
-            RenderSystem.disableDepthTest();
-            RenderSystem.depthFunc(GL11.GL_LEQUAL);
-        }
+        renderOutline(context, box, colorComponents, 1f, lineWidth, throughWalls);
     }
 
     /**
-- 
cgit