Skip to content

Commit 0829506

Browse files
committed
Remove last usage of Trove
Minecraft uses it internally, so we can rely on this always being around. I do not belive Trove exists within 1.13.
1 parent 71ee692 commit 0829506

File tree

2 files changed

+8
-12
lines changed

2 files changed

+8
-12
lines changed

src/main/java/dan200/computercraft/client/proxy/ComputerCraftProxyClient.java

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,7 @@
88

99
import dan200.computercraft.ComputerCraft;
1010
import dan200.computercraft.client.gui.*;
11-
import dan200.computercraft.client.render.ItemPocketRenderer;
12-
import dan200.computercraft.client.render.ItemPrintoutRenderer;
13-
import dan200.computercraft.client.render.RenderOverlayCable;
14-
import dan200.computercraft.client.render.TileEntityCableRenderer;
15-
import dan200.computercraft.client.render.TileEntityMonitorRenderer;
11+
import dan200.computercraft.client.render.*;
1612
import dan200.computercraft.shared.command.ContainerViewComputer;
1713
import dan200.computercraft.shared.computer.blocks.ComputerState;
1814
import dan200.computercraft.shared.computer.blocks.TileComputer;
@@ -35,7 +31,7 @@
3531
import dan200.computercraft.shared.turtle.blocks.TileTurtle;
3632
import dan200.computercraft.shared.turtle.entity.TurtleVisionCamera;
3733
import dan200.computercraft.shared.util.Colour;
38-
import gnu.trove.map.hash.TIntIntHashMap;
34+
import it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap;
3935
import net.minecraft.block.Block;
4036
import net.minecraft.client.Minecraft;
4137
import net.minecraft.client.gui.GuiNewChat;
@@ -75,7 +71,7 @@
7571

7672
public class ComputerCraftProxyClient extends ComputerCraftProxyCommon
7773
{
78-
private static TIntIntHashMap lastCounts = new TIntIntHashMap();
74+
private static Int2IntOpenHashMap lastCounts = new Int2IntOpenHashMap();
7975

8076
private long m_tick;
8177
private long m_renderFrame;

src/main/java/dan200/computercraft/core/tracking/ComputerTracker.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package dan200.computercraft.core.tracking;
22

33
import dan200.computercraft.core.computer.Computer;
4-
import gnu.trove.map.hash.TObjectLongHashMap;
4+
import it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap;
55

66
import javax.annotation.Nullable;
77
import java.lang.ref.WeakReference;
@@ -18,13 +18,13 @@ public class ComputerTracker
1818
private long serverCount;
1919
private long serverTime;
2020

21-
private final TObjectLongHashMap<TrackingField> fields;
21+
private final Object2LongOpenHashMap<TrackingField> fields;
2222

2323
public ComputerTracker( Computer computer )
2424
{
2525
this.computer = new WeakReference<>( computer );
2626
this.computerId = computer.getID();
27-
this.fields = new TObjectLongHashMap<>();
27+
this.fields = new Object2LongOpenHashMap<>();
2828
}
2929

3030
ComputerTracker( ComputerTracker timings )
@@ -39,7 +39,7 @@ public ComputerTracker( Computer computer )
3939
this.serverCount = timings.serverCount;
4040
this.serverTime = timings.serverTime;
4141

42-
this.fields = new TObjectLongHashMap<>( timings.fields );
42+
this.fields = new Object2LongOpenHashMap<>( timings.fields );
4343
}
4444

4545
@Nullable
@@ -90,7 +90,7 @@ void addValue( TrackingField field, long change )
9090
{
9191
synchronized( fields )
9292
{
93-
fields.adjustOrPutValue( field, change, change );
93+
fields.addTo( field, change );
9494
}
9595
}
9696

0 commit comments

Comments
 (0)