Unmark container on item takeout

samolego · Oct 25, 2022 · 2a49248 · 2a49248
1 parent e3ac641
commit 2a49248
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/...ent/src/main/java/org/samo_lego/clientstorage/fabric_client/event/ContainerDiscovery.java b/...ent/src/main/java/org/samo_lego/clientstorage/fabric_client/event/ContainerDiscovery.java
@@ -42,6 +42,7 @@
 import java.util.concurrent.LinkedBlockingDeque;
 
 import static org.samo_lego.clientstorage.fabric_client.ClientStorageFabric.config;
+import static org.samo_lego.clientstorage.fabric_client.util.ESPRender.BLOCK_ESPS;
 
 /**
  * The heart of the mod.
@@ -152,6 +153,8 @@ public static InteractionResult onUseBlock(Player player, Level world, Interacti
 
                     RemoteInventory.getInstance().sort();
                 }
+            } else {
+                BLOCK_ESPS.remove(craftingPos);
             }
         }
         return InteractionResult.PASS;

diff --git a/fabric-client/src/main/java/org/samo_lego/clientstorage/fabric_client/util/ESPRender.java b/fabric-client/src/main/java/org/samo_lego/clientstorage/fabric_client/util/ESPRender.java
@@ -24,18 +24,17 @@ public class ESPRender {
 
     public static final Set<BlockPos> BLOCK_ESPS = new HashSet<>();
     private static final ModelPart.Cube CUBE = new ModelPart.Cube(0, 0, 0, 0, 0, 16, 16, 16, 0, 0, 0, false, 0, 0);
-    private static final RenderType RENDER_TYPE = RenderType.outline(new ResourceLocation("minecraft", "textures/particles/white.png"));
-    private static boolean isAlreadyRenderingOutline = false;
+    private static final RenderType RENDER_TYPE = RenderType.outline(new ResourceLocation("textures/misc/white.png"));
 
     public static void render(PoseStack matrices, Camera camera, OutlineBufferSource vertexConsumers) {
         Vec3 pos = camera.getPosition();
         matrices.pushPose();
         matrices.translate(-pos.x, -pos.y, -pos.z);
-        renderBlockOutline(matrices, pos, vertexConsumers);
+        renderBlockOutlines(matrices, pos, vertexConsumers);
         matrices.popPose();
     }
 
-    public static void renderBlockOutline(PoseStack matrices, Vec3 playerPos, OutlineBufferSource vertexConsumers) {
+    public static void renderBlockOutlines(PoseStack matrices, Vec3 playerPos, OutlineBufferSource vertexConsumers) {
         vertexConsumers.setColor(255, 255, 255, 255);
 
         for (BlockPos pos : BLOCK_ESPS) {
@@ -60,13 +59,10 @@ public static void onRender(WorldRenderContext context) {
         var worldRenderer = (ALevelRenderer) context.worldRenderer();
 
         if (!BLOCK_ESPS.isEmpty()) {
-            if (!isAlreadyRenderingOutline) {
-                worldRenderer.getEntityEffect().process(context.tickDelta());
-                Minecraft.getInstance().getMainRenderTarget().bindWrite(false);
-            }
+            worldRenderer.getEntityEffect().process(context.tickDelta());
+            Minecraft.getInstance().getMainRenderTarget().bindWrite(false);
             render(context.matrixStack(), context.camera(), worldRenderer.getRenderBuffers().outlineBufferSource());
         }
-        isAlreadyRenderingOutline = false;
     }
 
     public static void markPos(BlockPos blockPos) {