dont keep the lines hashset around longer than we need it

Author: thiakil

src/main/java/mekanism/client/render/RenderTickHandler.java

@@ -4,13 +4,13 @@
 import com.mojang.blaze3d.vertex.VertexConsumer;
 import it.unimi.dsi.fastutil.objects.Reference2ObjectOpenHashMap;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Comparator;
 import java.util.EnumMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Objects;
-import java.util.Set;
 import java.util.UUID;
 import mekanism.api.RelativeSide;
 import mekanism.client.gui.GuiMekanism;
@@ -103,7 +103,7 @@ public class RenderTickHandler {
 
     public static final Minecraft minecraft = Minecraft.getInstance();
 
-    private static final Map<BlockState, Set<Line>> cachedWireFrames = new Reference2ObjectOpenHashMap<>();
+    private static final Map<BlockState, List<Line>> cachedWireFrames = new Reference2ObjectOpenHashMap<>();
     private static final Map<Direction, Map<TransmissionType, Model3D>> cachedOverlays = new EnumMap<>(Direction.class);
     private static final List<LazyRender> transparentRenderers = new ArrayList<>();
     private static final BoltRenderer boltRenderer = new BoltRenderer();
@@ -466,7 +466,7 @@ public void onBlockHover(RenderHighlightEvent.Block event) {
     }
 
     private void renderQuadsWireFrame(BlockState state, VertexConsumer buffer, PoseStack matrix, RandomSource rand) {
-        Set<Line> lines = cachedWireFrames.get(state);
+        List<Line> lines = cachedWireFrames.get(state);
         if (lines == null) {
             BakedModel bakedModel = Minecraft.getInstance().getBlockRenderer().getBlockModel(state);
             //TODO: Eventually we may want to add support for Model data and maybe render type
@@ -477,14 +477,14 @@ private void renderQuadsWireFrame(BlockState state, VertexConsumer buffer, PoseS
         renderVertexWireFrame(lines, buffer, pose.pose(), pose.normal());
     }
 
-    public static void renderVertexWireFrame(Set<Line> lines, VertexConsumer buffer, Matrix4f pose, Matrix3f poseNormal) {
+    public static void renderVertexWireFrame(Collection<Line> lines, VertexConsumer buffer, Matrix4f pose, Matrix3f poseNormal) {
         //tmp variables to avoid allocating each loop
         Vector4f pos = new Vector4f();
         Vector3f normal = new Vector3f();
         renderVertexWireFrame(lines, buffer, pose, poseNormal, pos, normal);
     }
 
-    public static void renderVertexWireFrame(Set<Line> lines, VertexConsumer buffer, Matrix4f pose, Matrix3f poseNormal, Vector4f pos, Vector3f normal) {
+    public static void renderVertexWireFrame(Collection<Line> lines, VertexConsumer buffer, Matrix4f pose, Matrix3f poseNormal, Vector4f pos, Vector3f normal) {
         for (Line line : lines) {
             poseNormal.transform(line.nX(), line.nY(), line.nZ(), normal);
 

src/main/java/mekanism/client/render/lib/Outlines.java

@@ -1,8 +1,9 @@
 package mekanism.client.render.lib;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashSet;
-import java.util.Objects;
+import java.util.List;
 import java.util.Set;
 import mekanism.common.util.EnumUtils;
 import net.minecraft.MethodsReturnNonnullByDefault;
@@ -21,7 +22,7 @@
 
 public class Outlines {
 
-    public static Set<Line> extract(BakedModel model, @Nullable BlockState state, RandomSource rand, ModelData modelData, @Nullable RenderType renderType) {
+    public static List<Line> extract(BakedModel model, @Nullable BlockState state, RandomSource rand, ModelData modelData, @Nullable RenderType renderType) {
         Set<Line> lines = new HashSet<>();
         VertexExtractor consumer = new VertexExtractor(lines);
         for (Direction direction : EnumUtils.DIRECTIONS) {
@@ -33,7 +34,7 @@ public static Set<Line> extract(BakedModel model, @Nullable BlockState state, Ra
         for (BakedQuad quad : model.getQuads(state, null, rand, modelData, renderType)) {
             consumer.unpack(quad);
         }
-        return lines;
+        return new ArrayList<>(lines);
     }
 
     //modified version of VertexConsumer

src/main/java/mekanism/client/render/tileentity/RenderPigmentMixer.java

@@ -4,7 +4,7 @@
 import com.mojang.blaze3d.vertex.PoseStack.Pose;
 import com.mojang.blaze3d.vertex.VertexConsumer;
 import com.mojang.math.Axis;
-import java.util.Set;
+import java.util.List;
 import mekanism.api.annotations.NothingNullByDefault;
 import mekanism.client.model.MekanismModelCache;
 import mekanism.client.render.RenderTickHandler;
@@ -30,7 +30,7 @@ public class RenderPigmentMixer extends MekanismTileEntityRenderer<TileEntityPig
 
     private static final float SHAFT_SPEED = 5F;
     @Nullable
-    private static Set<Line> lines;
+    private static List<Line> lines;
 
     public static void resetCached() {
         lines = null;

src/main/java/mekanism/client/render/tileentity/RenderSeismicVibrator.java

@@ -3,7 +3,7 @@
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.vertex.PoseStack.Pose;
 import com.mojang.blaze3d.vertex.VertexConsumer;
-import java.util.Set;
+import java.util.List;
 import mekanism.api.annotations.NothingNullByDefault;
 import mekanism.client.model.MekanismModelCache;
 import mekanism.client.render.RenderTickHandler;
@@ -26,7 +26,7 @@
 public class RenderSeismicVibrator extends MekanismTileEntityRenderer<TileEntitySeismicVibrator> implements IWireFrameRenderer {
 
     @Nullable
-    private static Set<Line> lines;
+    private static List<Line> lines;
 
     public static void resetCached() {
         lines = null;