mirrors/CC-Tweaked
1
0
Fork 0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2025-04-04 01:36:59 +00:00
Code Issues Releases Wiki Activity

Remove last usage of Trove

Browse Source 
Minecraft uses it internally, so we can rely on this always being
around. I do not belive Trove exists within 1.13.
This commit is contained in:
SquidDev 2018-11-22 12:15:55 +00:00
parent 71ee692da0
commit 0829506176
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/dan200/computercraft/client/proxy/ComputerCraftProxyClient.java
View File

@ -8,11 +8,7 @@ package dan200.computercraft.client.proxy;
import dan200.computercraft.ComputerCraft;
import dan200.computercraft.client.gui.*;
import dan200.computercraft.client.render.ItemPocketRenderer;
import dan200.computercraft.client.render.ItemPrintoutRenderer;
import dan200.computercraft.client.render.RenderOverlayCable;
import dan200.computercraft.client.render.TileEntityCableRenderer;
import dan200.computercraft.client.render.TileEntityMonitorRenderer;
import dan200.computercraft.client.render.*;
import dan200.computercraft.shared.command.ContainerViewComputer;
import dan200.computercraft.shared.computer.blocks.ComputerState;
import dan200.computercraft.shared.computer.blocks.TileComputer;
@ -35,7 +31,7 @@ import dan200.computercraft.shared.proxy.ComputerCraftProxyCommon;
import dan200.computercraft.shared.turtle.blocks.TileTurtle;
import dan200.computercraft.shared.turtle.entity.TurtleVisionCamera;
import dan200.computercraft.shared.util.Colour;
import gnu.trove.map.hash.TIntIntHashMap;
import it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap;
import net.minecraft.block.Block;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.GuiNewChat;
@ -75,7 +71,7 @@ import java.util.List;
public class ComputerCraftProxyClient extends ComputerCraftProxyCommon
{
private static TIntIntHashMap lastCounts = new TIntIntHashMap();
private static Int2IntOpenHashMap lastCounts = new Int2IntOpenHashMap();
private long m_tick;
private long m_renderFrame;

10
src/main/java/dan200/computercraft/core/tracking/ComputerTracker.java
View File

@ -1,7 +1,7 @@
package dan200.computercraft.core.tracking;
import dan200.computercraft.core.computer.Computer;
import gnu.trove.map.hash.TObjectLongHashMap;
import it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap;
import javax.annotation.Nullable;
import java.lang.ref.WeakReference;
@ -18,13 +18,13 @@ public class ComputerTracker
private long serverCount;
private long serverTime;
private final TObjectLongHashMap<TrackingField> fields;
private final Object2LongOpenHashMap<TrackingField> fields;
public ComputerTracker( Computer computer )
{
this.computer = new WeakReference<>( computer );
this.computerId = computer.getID();
this.fields = new TObjectLongHashMap<>();
this.fields = new Object2LongOpenHashMap<>();
}
ComputerTracker( ComputerTracker timings )
@ -39,7 +39,7 @@ public class ComputerTracker
this.serverCount = timings.serverCount;
this.serverTime = timings.serverTime;
this.fields = new TObjectLongHashMap<>( timings.fields );
this.fields = new Object2LongOpenHashMap<>( timings.fields );
}
@Nullable
@ -90,7 +90,7 @@ public class ComputerTracker
{
synchronized( fields )
{
fields.adjustOrPutValue( field, change, change );
fields.addTo( field, change );
}
}