Skip to content

Commit e869687

Browse files
committed
Some small fixes.
I forgot to refactor the tests so they actually compile... Also fixed small issue where the dimension thread load function called a client-sided function on the server. Fixed star-imports for style checking.
1 parent 3641c58 commit e869687

File tree

4 files changed

+25
-15
lines changed

4 files changed

+25
-15
lines changed

src/main/java/com/gamma/spool/core/Spool.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,11 @@
1616
import com.gamma.spool.config.ThreadsConfig;
1717
import com.gamma.spool.events.PlayerJoinTimeHandler;
1818
import com.gamma.spool.statistics.StatisticsManager;
19-
import com.gamma.spool.thread.*;
19+
import com.gamma.spool.thread.IThreadManager;
20+
import com.gamma.spool.thread.KeyedPoolThreadManager;
21+
import com.gamma.spool.thread.LBKeyedPoolThreadManager;
22+
import com.gamma.spool.thread.ManagerNames;
23+
import com.gamma.spool.thread.ThreadManager;
2024
import com.gamma.spool.util.caching.RegisteredCache;
2125
import com.gamma.spool.util.distance.DistanceThreadingUtil;
2226
import com.gamma.spool.watchdog.Watchdog;

src/main/java/com/gamma/spool/core/SpoolManagerOrchestrator.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,11 @@
22

33
import com.gamma.spool.config.ThreadManagerConfig;
44
import com.gamma.spool.config.ThreadsConfig;
5-
import com.gamma.spool.thread.*;
5+
import com.gamma.spool.thread.ForkThreadManager;
6+
import com.gamma.spool.thread.IThreadManager;
7+
import com.gamma.spool.thread.KeyedPoolThreadManager;
8+
import com.gamma.spool.thread.LBKeyedPoolThreadManager;
9+
import com.gamma.spool.thread.ManagerNames;
610
import com.gamma.spool.util.caching.RegisteredCache;
711
import com.gamma.spool.util.distance.DistanceThreadingUtil;
812
import com.gamma.spool.watchdog.Watchdog;

src/main/java/com/gamma/spool/mixin/minecraft/MinecraftServerMixin.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,11 +168,12 @@ public void updateTimeLightAndEntities() {
168168
if (dimensionManager instanceof LBKeyedPoolThreadManager) {
169169
((LBKeyedPoolThreadManager) dimensionManager).setLoadFunction(id, () -> {
170170
WorldServer worldObj = DimensionManager.getWorld(id);
171+
// TODO: Fine tune this.
171172
return (worldObj.playerEntities.size() / 10d)
172173
+ (ForgeChunkManager.getPersistentChunksFor(worldObj)
173174
.size() / 50d)
174-
+ (worldObj.getLoadedEntityList()
175-
.size() / 100d);
175+
+ (worldObj.loadedTileEntityList.size() / 80d)
176+
+ (worldObj.loadedEntityList.size() / 100d);
176177
});
177178
}
178179
}

src/test/java/com/gamma/spool/util/DistanceThreadingUtilTest.java

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

99
import net.minecraft.world.ChunkCoordIntPair;
1010

11-
import org.jctools.maps.NonBlockingHashSet;
1211
import org.junit.After;
1312
import org.junit.Before;
1413
import org.junit.Test;
@@ -21,6 +20,8 @@
2120
import com.gamma.spool.util.distance.DistanceThreadingUtil;
2221

2322
import it.unimi.dsi.fastutil.longs.Long2IntMap;
23+
import it.unimi.dsi.fastutil.longs.LongArraySet;
24+
import it.unimi.dsi.fastutil.longs.LongSet;
2425

2526
/**
2627
* Tests for the {@link DistanceThreadingUtil} class.
@@ -119,7 +120,7 @@ public void testFloodFillEmptyChunksSequential() {
119120
DistanceThreadingConfig.parallelizeStreams = false;
120121

121122
// Create an empty chunks set
122-
NonBlockingHashSet<Long> chunks = new NonBlockingHashSet<>();
123+
LongSet chunks = new LongArraySet();
123124

124125
// Create a seed chunk hash
125126
long seedChunkHash = ChunkCoordIntPair.chunkXZ2Int(0, 0);
@@ -147,7 +148,7 @@ public void testFloodFillEmptyChunksParallel() {
147148
DistanceThreadingConfig.parallelizeStreams = true;
148149

149150
// Create an empty chunks set
150-
NonBlockingHashSet<Long> chunks = new NonBlockingHashSet<>();
151+
LongSet chunks = new LongArraySet();
151152

152153
// Create a seed chunk hash
153154
long seedChunkHash = ChunkCoordIntPair.chunkXZ2Int(0, 0);
@@ -175,7 +176,7 @@ public void testFloodFillSingleChunkSequential() {
175176
DistanceThreadingConfig.parallelizeStreams = false;
176177

177178
// Create a chunks set with a single chunk
178-
NonBlockingHashSet<Long> chunks = new NonBlockingHashSet<>();
179+
LongSet chunks = new LongArraySet();
179180
long chunkHash = ChunkCoordIntPair.chunkXZ2Int(0, 0);
180181
chunks.add(chunkHash);
181182

@@ -202,7 +203,7 @@ public void testFloodFillSingleChunkParallel() {
202203
DistanceThreadingConfig.parallelizeStreams = true;
203204

204205
// Create a chunks set with a single chunk
205-
NonBlockingHashSet<Long> chunks = new NonBlockingHashSet<>();
206+
LongSet chunks = new LongArraySet();
206207
long chunkHash = ChunkCoordIntPair.chunkXZ2Int(0, 0);
207208
chunks.add(chunkHash);
208209

@@ -229,7 +230,7 @@ public void testFloodFillConnectedChunksSequential() {
229230
DistanceThreadingConfig.parallelizeStreams = false;
230231

231232
// Create a chunk set with connected chunks
232-
NonBlockingHashSet<Long> chunks = new NonBlockingHashSet<>();
233+
LongSet chunks = new LongArraySet();
233234
long seedChunkHash = ChunkCoordIntPair.chunkXZ2Int(0, 0);
234235
chunks.add(seedChunkHash);
235236

@@ -284,7 +285,7 @@ public void testFloodFillConnectedChunksParallel() {
284285
DistanceThreadingConfig.parallelizeStreams = true;
285286

286287
// Create a chunks set with connected chunks
287-
NonBlockingHashSet<Long> chunks = new NonBlockingHashSet<>();
288+
LongSet chunks = new LongArraySet();
288289
long seedChunkHash = ChunkCoordIntPair.chunkXZ2Int(0, 0);
289290
chunks.add(seedChunkHash);
290291

@@ -339,7 +340,7 @@ public void testFloodFillDisconnectedChunksSequential() {
339340
DistanceThreadingConfig.parallelizeStreams = false;
340341

341342
// Create a chunks set with disconnected chunks
342-
NonBlockingHashSet<Long> chunks = new NonBlockingHashSet<>();
343+
LongSet chunks = new LongArraySet();
343344
long seedChunkHash = ChunkCoordIntPair.chunkXZ2Int(0, 0);
344345
chunks.add(seedChunkHash);
345346

@@ -380,7 +381,7 @@ public void testFloodFillDisconnectedChunksParallel() {
380381
DistanceThreadingConfig.parallelizeStreams = true;
381382

382383
// Create a chunks set with disconnected chunks
383-
NonBlockingHashSet<Long> chunks = new NonBlockingHashSet<>();
384+
LongSet chunks = new LongArraySet();
384385
long seedChunkHash = ChunkCoordIntPair.chunkXZ2Int(0, 0);
385386
chunks.add(seedChunkHash);
386387

@@ -420,7 +421,7 @@ public void testFloodFillManyConnectedChunksSequential() {
420421
DistanceThreadingUtil.init(keyedPool);
421422

422423
// Create a chunks set with connected chunks
423-
NonBlockingHashSet<Long> chunks = new NonBlockingHashSet<>();
424+
LongSet chunks = new LongArraySet();
424425
long seedChunkHash = ChunkCoordIntPair.chunkXZ2Int(0, 0);
425426
chunks.add(seedChunkHash);
426427

@@ -474,7 +475,7 @@ public void testFloodFillManyConnectedChunksParallel() {
474475
DistanceThreadingConfig.parallelizeStreams = true;
475476

476477
// Create a chunks set with connected chunks
477-
NonBlockingHashSet<Long> chunks = new NonBlockingHashSet<>();
478+
LongSet chunks = new LongArraySet();
478479
long seedChunkHash = ChunkCoordIntPair.chunkXZ2Int(0, 0);
479480
chunks.add(seedChunkHash);
480481

0 commit comments

Comments
 (0)