Skip to content

Commit 6481c9a

Browse files
committed
Fix mixin & runtime errors
1 parent 179a83a commit 6481c9a

3 files changed

Lines changed: 14 additions & 15 deletions

File tree

examples/multiblock-lamps/fabric/build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@ dependencies {
4040
modRuntimeOnly("com.kneelawk.codextra:codextra-fabric:$codextra_version")
4141

4242
// KModLib Overlay
43-
val kml_version: String by project
44-
modRuntimeOnly("com.kneelawk.kmodlib:kmodlib-overlay-fabric:$kml_version")
45-
modRuntimeOnly("com.kneelawk.kmodlib:kmodlib-renderlayer:$kml_version")
43+
// val kml_version: String by project
44+
// modRuntimeOnly("com.kneelawk.kmodlib:kmodlib-overlay-fabric:$kml_version")
45+
// modRuntimeOnly("com.kneelawk.kmodlib:kmodlib-renderlayer:$kml_version")
4646

4747
// Mod Menu
4848
// val mod_menu_version: String by project

examples/multiblock-lamps/neoforge/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,6 @@ dependencies {
4040
runtimeOnly("com.kneelawk.codextra:codextra-neoforge:$codextra_version")
4141

4242
// KModLib Overlay
43-
val kml_version: String by project
44-
runtimeOnly("com.kneelawk.kmodlib:kmodlib-overlay-neoforge:$kml_version")
43+
// val kml_version: String by project
44+
// runtimeOnly("com.kneelawk.kmodlib:kmodlib-overlay-neoforge:$kml_version")
4545
}

modules/core-xplat/src/main/java/com/kneelawk/graphlib/impl/mixin/impl/ThreadedChunkManagerMixin.java

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import net.minecraft.server.level.ServerLevel;
1919
import net.minecraft.server.level.progress.ChunkProgressListener;
2020
import net.minecraft.util.thread.BlockableEventLoop;
21+
import net.minecraft.world.level.TicketStorage;
2122
import net.minecraft.world.level.chunk.ChunkGenerator;
2223
import net.minecraft.world.level.chunk.LightChunkGetter;
2324
import net.minecraft.world.level.entity.ChunkStatusUpdateListener;
@@ -40,16 +41,14 @@ public class ThreadedChunkManagerMixin implements GraphWorldStorageAccess {
4041
private ServerGraphWorldStorage storage;
4142

4243
@Inject(method = "<init>", at = @At("RETURN"))
43-
private void onCreate(ServerLevel world, LevelStorageSource.LevelStorageAccess session, DataFixer dataFixer,
44-
StructureTemplateManager structureTemplateManager, Executor executor,
45-
BlockableEventLoop<Runnable> mainThreadExecutor, LightChunkGetter chunkProvider,
46-
ChunkGenerator chunkGenerator,
47-
ChunkProgressListener worldGenerationProgressListener,
48-
ChunkStatusUpdateListener chunkStatusChangeListener,
49-
Supplier<DimensionDataStorage> persistentStateManagerFactory, int viewDistance,
50-
boolean dsync, CallbackInfo ci) {
51-
storage = new ServerGraphWorldStorage(session, world,
52-
session.getDimensionPath(world.dimension()).resolve(Constants.DATA_DIRNAME), dsync);
44+
private void onCreate(ServerLevel serverLevel, LevelStorageSource.LevelStorageAccess levelStorageAccess,
45+
DataFixer dataFixer, StructureTemplateManager structureTemplateManager, Executor executor,
46+
BlockableEventLoop blockableEventLoop, LightChunkGetter lightChunkGetter,
47+
ChunkGenerator chunkGenerator, ChunkProgressListener chunkProgressListener,
48+
ChunkStatusUpdateListener chunkStatusUpdateListener, Supplier supplier,
49+
TicketStorage ticketStorage, int i, boolean bl, CallbackInfo ci) {
50+
storage = new ServerGraphWorldStorage(levelStorageAccess, serverLevel,
51+
levelStorageAccess.getDimensionPath(serverLevel.dimension()).resolve(Constants.DATA_DIRNAME), bl);
5352
}
5453

5554
@Inject(method = "saveAllChunks", at = @At("HEAD"))

0 commit comments

Comments
 (0)