Skip to content

Commit 8d95c78

Browse files
committed
remove threaded chunkloading support
Can easily be re-added when needed. But at the moment there is no mod that introduces threaded chunkloading (from what I know). Fixes #14, #15
1 parent 27a88aa commit 8d95c78

4 files changed

Lines changed: 10 additions & 10 deletions

File tree

src/main/java/de/pilz/alternativechunkloading/AlternativeChunkloading.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
package de.pilz.alternativechunkloading;
22

3-
import java.util.ArrayList;
4-
53
import net.minecraftforge.common.MinecraftForge;
64

75
import org.apache.logging.log4j.LogManager;
@@ -23,7 +21,7 @@ public class AlternativeChunkloading {
2321
public static final String MODID = "alternativechunkloading";
2422
public static final Logger LOG = LogManager.getLogger(MODID);
2523

26-
public static final ArrayList<Long> ignoreThreads = new ArrayList<>();
24+
public static Internals internals = new Internals();
2725

2826
EventHandler eventHandler;
2927

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
package de.pilz.alternativechunkloading;
2+
3+
public class Internals {
4+
5+
public boolean isPopulating;
6+
}

src/main/java/de/pilz/alternativechunkloading/mixins/early/minecraft/MixinChunk.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,8 @@ public class MixinChunk {
1616
@WrapMethod(method = "populateChunk")
1717
private void populateChunk(IChunkProvider p_76624_1_, IChunkProvider p_76624_2_, int p_76624_3_, int p_76624_4_,
1818
Operation<Void> original) {
19-
long thread = Thread.currentThread()
20-
.getId();
21-
AlternativeChunkloading.ignoreThreads.add(thread);
19+
AlternativeChunkloading.internals.isPopulating = true;
2220
original.call(p_76624_1_, p_76624_2_, p_76624_3_, p_76624_4_);
23-
AlternativeChunkloading.ignoreThreads.remove(thread);
21+
AlternativeChunkloading.internals.isPopulating = false;
2422
}
2523
}

src/main/java/de/pilz/alternativechunkloading/mixins/early/minecraft/MixinChunkProviderServer.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@ public abstract class MixinChunkProviderServer {
2020
target = "Lnet/minecraft/world/gen/ChunkProviderServer;loadChunkOnProvideRequest:Z",
2121
opcode = Opcodes.GETFIELD))
2222
private boolean alternativechunkloading$provideChunk$allowChunkload(boolean original) {
23-
return original || AlternativeChunkloading.ignoreThreads.contains(
24-
Thread.currentThread()
25-
.getId());
23+
return original || AlternativeChunkloading.internals.isPopulating;
2624
}
2725
}

0 commit comments

Comments
 (0)