diff --git a/src/main/java/me/cortex/voxy/client/config/VoxyConfigScreenFactory.java b/src/main/java/me/cortex/voxy/client/config/VoxyConfigScreenFactory.java index 31d4ceae..54b8374f 100644 --- a/src/main/java/me/cortex/voxy/client/config/VoxyConfigScreenFactory.java +++ b/src/main/java/me/cortex/voxy/client/config/VoxyConfigScreenFactory.java @@ -106,20 +106,20 @@ public class VoxyConfigScreenFactory implements ModMenuApi { ConfigEntryBuilder entryBuilder = builder.entryBuilder(); /* - category.addEntry(entryBuilder.startIntSlider(Text.translatable("voxy.config.threads.service"), config.serviceThreads, 1, Runtime.getRuntime().availableProcessors()) - .setTooltip(Text.translatable("voxy.config.threads.tooltip")) + category.addEntry(entryBuilder.startIntSlider(Text.translatable("voxy.config.threads.ingest"), config.ingestThreads, 1, Runtime.getRuntime().availableProcessors()) + .setTooltip(Text.translatable("voxy.config.threads.ingest.tooltip")) .setSaveConsumer(val -> config.ingestThreads = val) .setDefaultValue(DEFAULT.ingestThreads) .build()); category.addEntry(entryBuilder.startIntSlider(Text.translatable("voxy.config.threads.saving"), config.savingThreads, 1, Runtime.getRuntime().availableProcessors()) - .setTooltip(Text.translatable("voxy.config.saving.tooltip")) + .setTooltip(Text.translatable("voxy.config.threads.saving.tooltip")) .setSaveConsumer(val -> config.savingThreads = val) .setDefaultValue(DEFAULT.savingThreads) .build()); category.addEntry(entryBuilder.startIntSlider(Text.translatable("voxy.config.threads.render"), config.renderThreads, 1, Runtime.getRuntime().availableProcessors()) - .setTooltip(Text.translatable("voxy.config.render.tooltip")) + .setTooltip(Text.translatable("voxy.config.threads.render.tooltip")) .setSaveConsumer(val -> config.renderThreads = val) .setDefaultValue(DEFAULT.renderThreads) .build()); diff --git a/src/main/java/me/cortex/voxy/client/mixin/chunky/MixinFabricWorld.java b/src/main/java/me/cortex/voxy/client/mixin/chunky/MixinFabricWorld.java index 0bed7478..1d008b45 100644 --- a/src/main/java/me/cortex/voxy/client/mixin/chunky/MixinFabricWorld.java +++ b/src/main/java/me/cortex/voxy/client/mixin/chunky/MixinFabricWorld.java @@ -2,20 +2,29 @@ package me.cortex.voxy.client.mixin.chunky; import com.llamalad7.mixinextras.injector.wrapoperation.Operation; import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation; +import me.cortex.voxy.client.Voxy; import me.cortex.voxy.client.config.VoxyConfig; import me.cortex.voxy.client.core.IGetVoxelCore; import net.minecraft.client.MinecraftClient; +import net.minecraft.client.util.math.MatrixStack; import net.minecraft.server.world.ChunkHolder; import net.minecraft.server.world.OptionalChunk; import net.minecraft.server.world.ServerChunkLoadingManager; +import net.minecraft.server.world.ServerWorld; import net.minecraft.world.chunk.Chunk; import net.minecraft.world.chunk.ChunkStatus; import net.minecraft.world.chunk.WorldChunk; +import org.joml.Matrix4f; import org.popcraft.chunky.platform.FabricWorld; +import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Redirect; import java.util.concurrent.CompletableFuture; +import java.util.concurrent.Executor; +import java.util.function.BiConsumer; @Mixin(FabricWorld.class) public class MixinFabricWorld {