Jika/oc2r
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use weak hash map for connector references in cable renderer.

Browse Source
This commit is contained in:
Florian Nücke
2021-01-09 07:17:01 +01:00
parent 00faa10348
commit c8aeef5cac
1 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/main/java/li/cil/oc2/client/renderer/NetworkCableRenderer.java
View File

@@ -22,9 +22,7 @@ import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.eventbus.api.SubscribeEvent;
import javax.annotation.Nullable;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.Objects;
import java.util.*;
public final class NetworkCableRenderer {
private static final int MAX_RENDER_DISTANCE = 100;
@@ -38,10 +36,12 @@ public final class NetworkCableRenderer {
private static final float CABLE_MAX_LENGTH = 8f;
private static final Vector3f CABLE_COLOR = new Vector3f(0.0f, 0.33f, 0.4f);
private static final ArrayList<NetworkConnectorTileEntity> connectors = new ArrayList<>();
private static final ArrayList<Connection> connections = new ArrayList<>();
private static final Set<NetworkConnectorTileEntity> connectors = Collections.newSetFromMap(new WeakHashMap<>());
private static int lastKnownConnectorCount;
private static boolean isDirty;
private static final ArrayList<Connection> connections = new ArrayList<>();
///////////////////////////////////////////////////////////////////
public static void initialize() {
@@ -183,13 +183,20 @@ public final class NetworkCableRenderer {
}
private static void validateConnectors() {
for (int i = connectors.size() - 1; i >= 0; i--) {
final NetworkConnectorTileEntity connector = connectors.get(i);
final ArrayList<NetworkConnectorTileEntity> list = new ArrayList<>(connectors);
for (final NetworkConnectorTileEntity connector : list) {
if (connector.isRemoved()) {
connectors.remove(i);
connectors.remove(connector);
invalidateConnections();
}
}
// We track the size because the WeakHasMap may expunge dead entries without
// us knowing otherwise.
if (list.size() != lastKnownConnectorCount) {
invalidateConnections();
}
lastKnownConnectorCount = list.size();
}
private static void validatePairs() {