From e9fba367c08124c77f52041acc87f4bc64704cc6 Mon Sep 17 00:00:00 2001 From: mcrcortex <18544518+MCRcortex@users.noreply.github.com> Date: Thu, 31 Jul 2025 16:06:16 +1000 Subject: [PATCH] cleanup java imports --- .../me/cortex/voxy/client/ClientImportManager.java | 3 --- .../me/cortex/voxy/client/TimingStatistics.java | 1 - .../java/me/cortex/voxy/client/VoxyClient.java | 2 +- .../me/cortex/voxy/client/VoxyClientInstance.java | 1 - .../java/me/cortex/voxy/client/VoxyCommands.java | 1 - .../cortex/voxy/client/core/VoxyRenderSystem.java | 4 ---- .../me/cortex/voxy/client/core/gl/GlBuffer.java | 1 - .../cortex/voxy/client/core/gl/GlRenderBuffer.java | 1 - .../me/cortex/voxy/client/core/gl/GlTexture.java | 2 -- .../client/core/gl/shader/AutoBindingShader.java | 1 - .../cortex/voxy/client/core/gl/shader/Shader.java | 1 - .../client/core/model/ModelBakerySubsystem.java | 12 ------------ .../voxy/client/core/model/ModelFactory.java | 4 ---- .../voxy/client/core/model/TextureUtils.java | 1 - .../core/model/bakery/BakedBlockEntityModel.java | 4 +--- .../client/core/model/bakery/GlViewCapture.java | 2 -- .../core/model/bakery/ModelTextureBakery.java | 1 - .../client/core/rendering/ChunkBoundRenderer.java | 2 -- .../voxy/client/core/rendering/GeometryCache.java | 1 - .../voxy/client/core/rendering/RenderService.java | 5 +++-- .../voxy/client/core/rendering/Viewport.java | 1 - .../client/core/rendering/ViewportSelector.java | 1 - .../building/RenderGenerationService.java | 4 ++-- .../rendering/hierachical/AsyncNodeManager.java | 4 +++- .../core/rendering/hierachical/DebugRenderer.java | 2 +- .../core/rendering/hierachical/NodeCleaner.java | 3 +-- .../core/rendering/hierachical/NodeManager.java | 1 - .../client/core/rendering/post/PostProcessing.java | 1 - .../rendering/section/MDICSectionRenderer.java | 7 +++---- .../client/core/rendering/util/ComputeUtils.java | 4 ---- .../client/core/rendering/util/DownloadStream.java | 2 +- .../client/core/rendering/util/GlStateCapture.java | 2 -- .../voxy/client/core/rendering/util/HiZBuffer.java | 1 - .../client/core/rendering/util/HiZBuffer2.java | 1 - .../client/core/rendering/util/LightMapHelper.java | 9 +-------- .../client/core/rendering/util/UploadStream.java | 3 --- .../me/cortex/voxy/client/core/util/IrisUtil.java | 1 - .../minecraft/MixinClientLoginNetworkHandler.java | 10 +--------- .../client/mixin/minecraft/MixinWorldRenderer.java | 5 ++--- .../mixin/sodium/MixinDefaultChunkRenderer.java | 2 -- .../mixin/sodium/MixinRenderSectionManager.java | 2 -- .../cortex/voxy/client/taskbar/WindowsTaskbar.java | 3 +-- .../common/config/compressors/LZMACompressor.java | 12 ------------ .../config/compressors/StorageCompressor.java | 2 -- .../common/config/compressors/ZSTDCompressor.java | 2 -- .../section/SectionSerializationStorage.java | 2 -- .../voxy/common/config/storage/StorageBackend.java | 3 --- .../storage/inmemory/MemoryStorageBackend.java | 2 +- .../config/storage/lmdb/LMDBStorageBackend.java | 3 +-- .../storage/other/BasicPathInsertionConfig.java | 2 +- .../storage/other/CompressionStorageAdaptor.java | 6 +++--- .../other/ConditionalStorageBackendConfig.java | 2 +- .../other/FragmentedStorageBackendAdaptor.java | 2 +- .../config/storage/other/ReadonlyCachingLayer.java | 2 +- .../config/storage/redis/RedisStorageBackend.java | 2 +- .../storage/rocksdb/RocksDBStorageBackend.java | 3 +-- .../voxy/common/thread/QueuedServiceSlice.java | 6 ------ .../voxy/common/thread/ServiceThreadPool.java | 4 ---- .../cortex/voxy/common/util/AllocationArena.java | 3 --- .../java/me/cortex/voxy/common/util/MultiGson.java | 5 ++++- .../voxy/common/util/ThreadLocalMemoryBuffer.java | 2 -- .../me/cortex/voxy/common/util/ThreadUtils.java | 6 +----- .../me/cortex/voxy/common/util/cpu/CpuLayout.java | 1 - .../voxy/common/voxelization/VoxelizedSection.java | 2 -- .../voxelization/WorldConversionFactory.java | 4 +--- .../voxy/common/world/ActiveSectionTracker.java | 1 - .../cortex/voxy/common/world/SaveLoadSystem.java | 2 -- .../cortex/voxy/common/world/SaveLoadSystem2.java | 4 ---- .../cortex/voxy/common/world/SaveLoadSystem3.java | 2 -- .../me/cortex/voxy/common/world/WorldSection.java | 3 --- .../me/cortex/voxy/common/world/other/Mapper.java | 6 ++++-- .../common/world/service/SectionSavingService.java | 7 ++----- .../common/world/service/VoxelIngestService.java | 5 ++--- .../voxy/commonImpl/importers/DHImporter.java | 1 - .../voxy/commonImpl/importers/WorldImporter.java | 14 +++++++++----- .../commonImpl/mixin/chunky/MixinFabricWorld.java | 2 -- .../commonImpl/mixin/minecraft/MixinWorld.java | 1 - 77 files changed, 55 insertions(+), 190 deletions(-) diff --git a/src/main/java/me/cortex/voxy/client/ClientImportManager.java b/src/main/java/me/cortex/voxy/client/ClientImportManager.java index 73848d25..6aed8434 100644 --- a/src/main/java/me/cortex/voxy/client/ClientImportManager.java +++ b/src/main/java/me/cortex/voxy/client/ClientImportManager.java @@ -1,8 +1,6 @@ package me.cortex.voxy.client; -import me.cortex.voxy.client.taskbar.Taskbar; import me.cortex.voxy.common.Logger; -import me.cortex.voxy.common.thread.ServiceThreadPool; import me.cortex.voxy.commonImpl.ImportManager; import me.cortex.voxy.commonImpl.importers.IDataImporter; import net.minecraft.client.MinecraftClient; @@ -12,7 +10,6 @@ import net.minecraft.text.Text; import net.minecraft.util.math.MathHelper; import java.util.UUID; -import java.util.function.BooleanSupplier; public class ClientImportManager extends ImportManager { protected class ClientImportTask extends ImportTask { diff --git a/src/main/java/me/cortex/voxy/client/TimingStatistics.java b/src/main/java/me/cortex/voxy/client/TimingStatistics.java index fcf4346e..e5ba0c79 100644 --- a/src/main/java/me/cortex/voxy/client/TimingStatistics.java +++ b/src/main/java/me/cortex/voxy/client/TimingStatistics.java @@ -1,6 +1,5 @@ package me.cortex.voxy.client; -import java.lang.invoke.VarHandle; import java.util.ArrayList; public class TimingStatistics { diff --git a/src/main/java/me/cortex/voxy/client/VoxyClient.java b/src/main/java/me/cortex/voxy/client/VoxyClient.java index aa070675..9525315d 100644 --- a/src/main/java/me/cortex/voxy/client/VoxyClient.java +++ b/src/main/java/me/cortex/voxy/client/VoxyClient.java @@ -6,7 +6,7 @@ import me.cortex.voxy.client.core.rendering.util.SharedIndexBuffer; import me.cortex.voxy.common.Logger; import me.cortex.voxy.commonImpl.VoxyCommon; import net.fabricmc.api.ClientModInitializer; - import net.fabricmc.fabric.api.client.command.v2.ClientCommandRegistrationCallback; +import net.fabricmc.fabric.api.client.command.v2.ClientCommandRegistrationCallback; import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientLifecycleEvents; import net.fabricmc.loader.api.FabricLoader; diff --git a/src/main/java/me/cortex/voxy/client/VoxyClientInstance.java b/src/main/java/me/cortex/voxy/client/VoxyClientInstance.java index 8fdb668f..cb88c225 100644 --- a/src/main/java/me/cortex/voxy/client/VoxyClientInstance.java +++ b/src/main/java/me/cortex/voxy/client/VoxyClientInstance.java @@ -16,7 +16,6 @@ import me.cortex.voxy.commonImpl.WorldIdentifier; import net.minecraft.client.MinecraftClient; import net.minecraft.util.WorldSavePath; -import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; import java.security.MessageDigest; diff --git a/src/main/java/me/cortex/voxy/client/VoxyCommands.java b/src/main/java/me/cortex/voxy/client/VoxyCommands.java index 6c8ec6f3..d846211a 100644 --- a/src/main/java/me/cortex/voxy/client/VoxyCommands.java +++ b/src/main/java/me/cortex/voxy/client/VoxyCommands.java @@ -6,7 +6,6 @@ import com.mojang.brigadier.context.CommandContext; import com.mojang.brigadier.suggestion.Suggestions; import com.mojang.brigadier.suggestion.SuggestionsBuilder; import me.cortex.voxy.client.core.IGetVoxyRenderSystem; -import me.cortex.voxy.common.world.WorldEngine; import me.cortex.voxy.commonImpl.VoxyCommon; import me.cortex.voxy.commonImpl.WorldIdentifier; import me.cortex.voxy.commonImpl.importers.DHImporter; diff --git a/src/main/java/me/cortex/voxy/client/core/VoxyRenderSystem.java b/src/main/java/me/cortex/voxy/client/core/VoxyRenderSystem.java index be7d1c0b..b698ddd8 100644 --- a/src/main/java/me/cortex/voxy/client/core/VoxyRenderSystem.java +++ b/src/main/java/me/cortex/voxy/client/core/VoxyRenderSystem.java @@ -5,7 +5,6 @@ import com.mojang.blaze3d.opengl.GlStateManager; import me.cortex.voxy.client.TimingStatistics; import me.cortex.voxy.client.VoxyClient; import me.cortex.voxy.client.config.VoxyConfig; -import me.cortex.voxy.client.core.gl.Capabilities; import me.cortex.voxy.client.core.gl.GlBuffer; import me.cortex.voxy.client.core.gl.GlTexture; import me.cortex.voxy.client.core.rendering.ChunkBoundRenderer; @@ -14,7 +13,6 @@ import me.cortex.voxy.client.core.rendering.RenderService; import me.cortex.voxy.client.core.rendering.post.PostProcessing; import me.cortex.voxy.client.core.rendering.util.DownloadStream; import me.cortex.voxy.client.core.rendering.util.PrintfDebugUtil; -import me.cortex.voxy.client.core.rendering.util.SharedIndexBuffer; import me.cortex.voxy.client.core.rendering.util.UploadStream; import me.cortex.voxy.client.core.util.IrisUtil; import me.cortex.voxy.common.Logger; @@ -23,8 +21,6 @@ import me.cortex.voxy.common.world.WorldEngine; import net.caffeinemc.mods.sodium.client.render.chunk.ChunkRenderMatrices; import net.caffeinemc.mods.sodium.client.util.FogParameters; import net.minecraft.client.MinecraftClient; -import net.minecraft.client.render.Camera; -import net.minecraft.client.render.Frustum; import org.joml.Matrix4f; import org.joml.Matrix4fc; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/me/cortex/voxy/client/core/gl/GlBuffer.java b/src/main/java/me/cortex/voxy/client/core/gl/GlBuffer.java index 0844e0de..0c74d745 100644 --- a/src/main/java/me/cortex/voxy/client/core/gl/GlBuffer.java +++ b/src/main/java/me/cortex/voxy/client/core/gl/GlBuffer.java @@ -5,7 +5,6 @@ import org.lwjgl.opengl.GL11; import static org.lwjgl.opengl.GL11.GL_UNSIGNED_BYTE; import static org.lwjgl.opengl.GL15.glDeleteBuffers; -import static org.lwjgl.opengl.GL44C.glBufferStorage; import static org.lwjgl.opengl.GL45C.*; public class GlBuffer extends TrackedObject { diff --git a/src/main/java/me/cortex/voxy/client/core/gl/GlRenderBuffer.java b/src/main/java/me/cortex/voxy/client/core/gl/GlRenderBuffer.java index 7821c718..e6f5acec 100644 --- a/src/main/java/me/cortex/voxy/client/core/gl/GlRenderBuffer.java +++ b/src/main/java/me/cortex/voxy/client/core/gl/GlRenderBuffer.java @@ -2,7 +2,6 @@ package me.cortex.voxy.client.core.gl; import me.cortex.voxy.common.util.TrackedObject; -import static org.lwjgl.opengl.GL11C.*; import static org.lwjgl.opengl.GL45C.*; public class GlRenderBuffer extends TrackedObject { diff --git a/src/main/java/me/cortex/voxy/client/core/gl/GlTexture.java b/src/main/java/me/cortex/voxy/client/core/gl/GlTexture.java index ccf3391e..b1c3d46b 100644 --- a/src/main/java/me/cortex/voxy/client/core/gl/GlTexture.java +++ b/src/main/java/me/cortex/voxy/client/core/gl/GlTexture.java @@ -2,8 +2,6 @@ package me.cortex.voxy.client.core.gl; import me.cortex.voxy.common.util.TrackedObject; -import static org.lwjgl.opengl.ARBFramebufferObject.glDeleteFramebuffers; -import static org.lwjgl.opengl.ARBFramebufferObject.glGenFramebuffers; import static org.lwjgl.opengl.GL11.GL_RGBA8; import static org.lwjgl.opengl.GL11C.*; import static org.lwjgl.opengl.GL30.GL_DEPTH24_STENCIL8; diff --git a/src/main/java/me/cortex/voxy/client/core/gl/shader/AutoBindingShader.java b/src/main/java/me/cortex/voxy/client/core/gl/shader/AutoBindingShader.java index 81b0209d..52100bd7 100644 --- a/src/main/java/me/cortex/voxy/client/core/gl/shader/AutoBindingShader.java +++ b/src/main/java/me/cortex/voxy/client/core/gl/shader/AutoBindingShader.java @@ -14,7 +14,6 @@ import static org.lwjgl.opengl.GL30.glBindBufferRange; import static org.lwjgl.opengl.GL31.GL_UNIFORM_BUFFER; import static org.lwjgl.opengl.GL33.glBindSampler; import static org.lwjgl.opengl.GL43.GL_SHADER_STORAGE_BUFFER; -import static org.lwjgl.opengl.GL44.*; //TODO: rewrite the entire shader builder system diff --git a/src/main/java/me/cortex/voxy/client/core/gl/shader/Shader.java b/src/main/java/me/cortex/voxy/client/core/gl/shader/Shader.java index bf0629c8..25a6ed69 100644 --- a/src/main/java/me/cortex/voxy/client/core/gl/shader/Shader.java +++ b/src/main/java/me/cortex/voxy/client/core/gl/shader/Shader.java @@ -1,7 +1,6 @@ package me.cortex.voxy.client.core.gl.shader; import me.cortex.voxy.client.core.gl.Capabilities; -import me.cortex.voxy.client.core.gl.GlBuffer; import me.cortex.voxy.client.core.gl.GlDebug; import me.cortex.voxy.common.Logger; import me.cortex.voxy.common.util.ThreadUtils; diff --git a/src/main/java/me/cortex/voxy/client/core/model/ModelBakerySubsystem.java b/src/main/java/me/cortex/voxy/client/core/model/ModelBakerySubsystem.java index 894b9cd4..139b83ed 100644 --- a/src/main/java/me/cortex/voxy/client/core/model/ModelBakerySubsystem.java +++ b/src/main/java/me/cortex/voxy/client/core/model/ModelBakerySubsystem.java @@ -1,33 +1,21 @@ package me.cortex.voxy.client.core.model; -import it.unimi.dsi.fastutil.ints.IntLinkedOpenHashSet; import it.unimi.dsi.fastutil.ints.IntOpenHashSet; -import me.cortex.voxy.client.TimingStatistics; -import me.cortex.voxy.client.core.gl.GlFramebuffer; -import me.cortex.voxy.client.core.rendering.building.BuiltSection; -import me.cortex.voxy.client.core.rendering.util.RawDownloadStream; import me.cortex.voxy.common.world.other.Mapper; import net.minecraft.client.MinecraftClient; import net.minecraft.registry.RegistryKeys; import net.minecraft.util.Identifier; -import org.lwjgl.opengl.GL11; -import java.lang.invoke.VarHandle; import java.util.List; import java.util.concurrent.ConcurrentLinkedDeque; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.locks.StampedLock; -import static org.lwjgl.opengl.ARBFramebufferObject.GL_COLOR_ATTACHMENT0; -import static org.lwjgl.opengl.GL11.GL_COLOR_BUFFER_BIT; import static org.lwjgl.opengl.GL11.glGetInteger; -import static org.lwjgl.opengl.GL11C.GL_NEAREST; import static org.lwjgl.opengl.GL30.GL_FRAMEBUFFER; import static org.lwjgl.opengl.GL30.GL_FRAMEBUFFER_BINDING; -import static org.lwjgl.opengl.GL30C.GL_DRAW_FRAMEBUFFER_BINDING; import static org.lwjgl.opengl.GL30C.glBindFramebuffer; -import static org.lwjgl.opengl.GL45.glBlitNamedFramebuffer; public class ModelBakerySubsystem { //Redo to just make it request the block faces with the async texture download stream which diff --git a/src/main/java/me/cortex/voxy/client/core/model/ModelFactory.java b/src/main/java/me/cortex/voxy/client/core/model/ModelFactory.java index cc9eef29..3c29b6e3 100644 --- a/src/main/java/me/cortex/voxy/client/core/model/ModelFactory.java +++ b/src/main/java/me/cortex/voxy/client/core/model/ModelFactory.java @@ -19,7 +19,6 @@ import net.minecraft.block.entity.BlockEntity; import net.minecraft.client.MinecraftClient; import net.minecraft.client.color.block.BlockColorProvider; import net.minecraft.client.render.BlockRenderLayer; -import net.minecraft.client.render.RenderLayer; import net.minecraft.client.render.RenderLayers; import net.minecraft.fluid.FluidState; import net.minecraft.registry.Registries; @@ -41,9 +40,6 @@ import java.util.*; import static me.cortex.voxy.client.core.model.ModelStore.MODEL_SIZE; import static org.lwjgl.opengl.ARBDirectStateAccess.nglTextureSubImage2D; import static org.lwjgl.opengl.GL11.*; -import static org.lwjgl.opengl.GL33.glDeleteSamplers; -import static org.lwjgl.opengl.GL33.glGenSamplers; -import static org.lwjgl.opengl.GL45C.glTextureSubImage2D; //Manages the storage and updating of model states, textures and colours diff --git a/src/main/java/me/cortex/voxy/client/core/model/TextureUtils.java b/src/main/java/me/cortex/voxy/client/core/model/TextureUtils.java index b82aa1bc..bbc397e2 100644 --- a/src/main/java/me/cortex/voxy/client/core/model/TextureUtils.java +++ b/src/main/java/me/cortex/voxy/client/core/model/TextureUtils.java @@ -1,7 +1,6 @@ package me.cortex.voxy.client.core.model; import net.caffeinemc.mods.sodium.client.util.color.ColorSRGB; -import net.minecraft.util.math.ColorHelper; //Texturing utils to manipulate data from the model bakery public class TextureUtils { diff --git a/src/main/java/me/cortex/voxy/client/core/model/bakery/BakedBlockEntityModel.java b/src/main/java/me/cortex/voxy/client/core/model/bakery/BakedBlockEntityModel.java index a0658b51..18c55250 100644 --- a/src/main/java/me/cortex/voxy/client/core/model/bakery/BakedBlockEntityModel.java +++ b/src/main/java/me/cortex/voxy/client/core/model/bakery/BakedBlockEntityModel.java @@ -1,12 +1,10 @@ package me.cortex.voxy.client.core.model.bakery; -import com.mojang.blaze3d.textures.GpuTexture; import me.cortex.voxy.common.Logger; import net.minecraft.block.BlockEntityProvider; import net.minecraft.block.BlockState; import net.minecraft.client.MinecraftClient; -import net.minecraft.client.gl.GlGpuBuffer; -import net.minecraft.client.render.*; +import net.minecraft.client.render.RenderLayer; import net.minecraft.client.util.math.MatrixStack; import net.minecraft.util.Identifier; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/me/cortex/voxy/client/core/model/bakery/GlViewCapture.java b/src/main/java/me/cortex/voxy/client/core/model/bakery/GlViewCapture.java index bcabdc79..06057631 100644 --- a/src/main/java/me/cortex/voxy/client/core/model/bakery/GlViewCapture.java +++ b/src/main/java/me/cortex/voxy/client/core/model/bakery/GlViewCapture.java @@ -1,6 +1,5 @@ package me.cortex.voxy.client.core.model.bakery; -import me.cortex.voxy.client.core.gl.GlBuffer; import me.cortex.voxy.client.core.gl.GlFramebuffer; import me.cortex.voxy.client.core.gl.GlTexture; import me.cortex.voxy.client.core.gl.shader.Shader; @@ -14,7 +13,6 @@ import static org.lwjgl.opengl.ARBShaderImageLoadStore.GL_SHADER_IMAGE_ACCESS_BA import static org.lwjgl.opengl.ARBShaderImageLoadStore.GL_TEXTURE_UPDATE_BARRIER_BIT; import static org.lwjgl.opengl.ARBShaderImageLoadStore.glMemoryBarrier; import static org.lwjgl.opengl.GL11.*; -import static org.lwjgl.opengl.GL11.GL_STENCIL_INDEX; import static org.lwjgl.opengl.GL30.*; import static org.lwjgl.opengl.GL43.*; import static org.lwjgl.opengl.GL45.glClearNamedFramebufferfi; diff --git a/src/main/java/me/cortex/voxy/client/core/model/bakery/ModelTextureBakery.java b/src/main/java/me/cortex/voxy/client/core/model/bakery/ModelTextureBakery.java index 906f57e0..bb0dd219 100644 --- a/src/main/java/me/cortex/voxy/client/core/model/bakery/ModelTextureBakery.java +++ b/src/main/java/me/cortex/voxy/client/core/model/bakery/ModelTextureBakery.java @@ -10,7 +10,6 @@ import net.minecraft.fluid.FluidState; import net.minecraft.util.Identifier; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; -import net.minecraft.util.math.RotationAxis; import net.minecraft.util.math.random.LocalRandom; import net.minecraft.world.BlockRenderView; import net.minecraft.world.LightType; diff --git a/src/main/java/me/cortex/voxy/client/core/rendering/ChunkBoundRenderer.java b/src/main/java/me/cortex/voxy/client/core/rendering/ChunkBoundRenderer.java index a46de692..ba46c392 100644 --- a/src/main/java/me/cortex/voxy/client/core/rendering/ChunkBoundRenderer.java +++ b/src/main/java/me/cortex/voxy/client/core/rendering/ChunkBoundRenderer.java @@ -1,6 +1,5 @@ package me.cortex.voxy.client.core.rendering; -import it.unimi.dsi.fastutil.longs.Long2ByteOpenHashMap; import it.unimi.dsi.fastutil.longs.Long2IntOpenHashMap; import it.unimi.dsi.fastutil.longs.LongOpenHashSet; import me.cortex.voxy.client.core.gl.GlBuffer; @@ -26,7 +25,6 @@ import static org.lwjgl.opengl.GL15.GL_ELEMENT_ARRAY_BUFFER; import static org.lwjgl.opengl.GL15.glBindBuffer; import static org.lwjgl.opengl.GL30.glBindVertexArray; import static org.lwjgl.opengl.GL30C.*; -import static org.lwjgl.opengl.GL31.GL_UNIFORM_BUFFER; import static org.lwjgl.opengl.GL31.glDrawElementsInstanced; import static org.lwjgl.opengl.GL42.glDrawElementsInstancedBaseInstance; import static org.lwjgl.opengl.GL45.glClearNamedFramebufferfv; diff --git a/src/main/java/me/cortex/voxy/client/core/rendering/GeometryCache.java b/src/main/java/me/cortex/voxy/client/core/rendering/GeometryCache.java index c522af3d..dfd8b034 100644 --- a/src/main/java/me/cortex/voxy/client/core/rendering/GeometryCache.java +++ b/src/main/java/me/cortex/voxy/client/core/rendering/GeometryCache.java @@ -4,7 +4,6 @@ import it.unimi.dsi.fastutil.longs.Long2ObjectLinkedOpenHashMap; import me.cortex.voxy.client.core.rendering.building.BuiltSection; import java.util.concurrent.locks.ReentrantLock; -import java.util.concurrent.locks.StampedLock; //CPU side cache for section geometry, not thread safe public class GeometryCache { diff --git a/src/main/java/me/cortex/voxy/client/core/rendering/RenderService.java b/src/main/java/me/cortex/voxy/client/core/rendering/RenderService.java index 09fb879c..a2eb6f6b 100644 --- a/src/main/java/me/cortex/voxy/client/core/rendering/RenderService.java +++ b/src/main/java/me/cortex/voxy/client/core/rendering/RenderService.java @@ -11,14 +11,15 @@ import me.cortex.voxy.client.core.rendering.hierachical.AsyncNodeManager; import me.cortex.voxy.client.core.rendering.hierachical.HierarchicalOcclusionTraverser; import me.cortex.voxy.client.core.rendering.hierachical.NodeCleaner; import me.cortex.voxy.client.core.rendering.section.AbstractSectionRenderer; -import me.cortex.voxy.client.core.rendering.section.geometry.*; import me.cortex.voxy.client.core.rendering.section.IUsesMeshlets; import me.cortex.voxy.client.core.rendering.section.MDICSectionRenderer; +import me.cortex.voxy.client.core.rendering.section.geometry.BasicSectionGeometryData; +import me.cortex.voxy.client.core.rendering.section.geometry.IGeometryData; import me.cortex.voxy.client.core.rendering.util.DownloadStream; import me.cortex.voxy.client.core.rendering.util.UploadStream; import me.cortex.voxy.common.Logger; -import me.cortex.voxy.common.world.WorldEngine; import me.cortex.voxy.common.thread.ServiceThreadPool; +import me.cortex.voxy.common.world.WorldEngine; import java.util.Arrays; import java.util.List; diff --git a/src/main/java/me/cortex/voxy/client/core/rendering/Viewport.java b/src/main/java/me/cortex/voxy/client/core/rendering/Viewport.java index 98b5dbb2..fa6ae6ab 100644 --- a/src/main/java/me/cortex/voxy/client/core/rendering/Viewport.java +++ b/src/main/java/me/cortex/voxy/client/core/rendering/Viewport.java @@ -2,7 +2,6 @@ package me.cortex.voxy.client.core.rendering; import me.cortex.voxy.client.core.gl.GlBuffer; import me.cortex.voxy.client.core.rendering.util.HiZBuffer; -import me.cortex.voxy.client.core.rendering.util.HiZBuffer2; import net.caffeinemc.mods.sodium.client.util.FogParameters; import net.minecraft.util.math.MathHelper; import org.joml.*; diff --git a/src/main/java/me/cortex/voxy/client/core/rendering/ViewportSelector.java b/src/main/java/me/cortex/voxy/client/core/rendering/ViewportSelector.java index 8e1c54bb..0793c99e 100644 --- a/src/main/java/me/cortex/voxy/client/core/rendering/ViewportSelector.java +++ b/src/main/java/me/cortex/voxy/client/core/rendering/ViewportSelector.java @@ -1,6 +1,5 @@ package me.cortex.voxy.client.core.rendering; -import me.cortex.voxy.client.core.rendering.Viewport; import net.fabricmc.loader.api.FabricLoader; import org.vivecraft.client_vr.ClientDataHolderVR; diff --git a/src/main/java/me/cortex/voxy/client/core/rendering/building/RenderGenerationService.java b/src/main/java/me/cortex/voxy/client/core/rendering/building/RenderGenerationService.java index 01020a14..cefc2f70 100644 --- a/src/main/java/me/cortex/voxy/client/core/rendering/building/RenderGenerationService.java +++ b/src/main/java/me/cortex/voxy/client/core/rendering/building/RenderGenerationService.java @@ -4,12 +4,12 @@ import it.unimi.dsi.fastutil.ints.IntOpenHashSet; import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap; import me.cortex.voxy.client.core.model.IdNotYetComputedException; import me.cortex.voxy.client.core.model.ModelBakerySubsystem; +import me.cortex.voxy.common.thread.ServiceSlice; +import me.cortex.voxy.common.thread.ServiceThreadPool; import me.cortex.voxy.common.util.Pair; import me.cortex.voxy.common.world.WorldEngine; import me.cortex.voxy.common.world.WorldSection; import me.cortex.voxy.common.world.other.Mapper; -import me.cortex.voxy.common.thread.ServiceSlice; -import me.cortex.voxy.common.thread.ServiceThreadPool; import java.util.List; import java.util.concurrent.PriorityBlockingQueue; diff --git a/src/main/java/me/cortex/voxy/client/core/rendering/hierachical/AsyncNodeManager.java b/src/main/java/me/cortex/voxy/client/core/rendering/hierachical/AsyncNodeManager.java index 69b3e40d..bf63608d 100644 --- a/src/main/java/me/cortex/voxy/client/core/rendering/hierachical/AsyncNodeManager.java +++ b/src/main/java/me/cortex/voxy/client/core/rendering/hierachical/AsyncNodeManager.java @@ -1,6 +1,8 @@ package me.cortex.voxy.client.core.rendering.hierachical; -import it.unimi.dsi.fastutil.ints.*; +import it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap; +import it.unimi.dsi.fastutil.ints.IntConsumer; +import it.unimi.dsi.fastutil.ints.IntOpenHashSet; import it.unimi.dsi.fastutil.longs.LongOpenHashSet; import me.cortex.voxy.client.TimingStatistics; import me.cortex.voxy.client.core.gl.GlBuffer; diff --git a/src/main/java/me/cortex/voxy/client/core/rendering/hierachical/DebugRenderer.java b/src/main/java/me/cortex/voxy/client/core/rendering/hierachical/DebugRenderer.java index 3401eefb..d89baab4 100644 --- a/src/main/java/me/cortex/voxy/client/core/rendering/hierachical/DebugRenderer.java +++ b/src/main/java/me/cortex/voxy/client/core/rendering/hierachical/DebugRenderer.java @@ -4,8 +4,8 @@ import me.cortex.voxy.client.core.gl.GlBuffer; import me.cortex.voxy.client.core.gl.shader.Shader; import me.cortex.voxy.client.core.gl.shader.ShaderType; import me.cortex.voxy.client.core.rendering.RenderService; -import me.cortex.voxy.client.core.rendering.util.SharedIndexBuffer; import me.cortex.voxy.client.core.rendering.Viewport; +import me.cortex.voxy.client.core.rendering.util.SharedIndexBuffer; import me.cortex.voxy.client.core.rendering.util.UploadStream; import net.minecraft.util.math.MathHelper; import org.joml.Matrix4f; diff --git a/src/main/java/me/cortex/voxy/client/core/rendering/hierachical/NodeCleaner.java b/src/main/java/me/cortex/voxy/client/core/rendering/hierachical/NodeCleaner.java index 73f5a696..9067be84 100644 --- a/src/main/java/me/cortex/voxy/client/core/rendering/hierachical/NodeCleaner.java +++ b/src/main/java/me/cortex/voxy/client/core/rendering/hierachical/NodeCleaner.java @@ -5,13 +5,12 @@ import me.cortex.voxy.client.core.gl.GlBuffer; import me.cortex.voxy.client.core.gl.shader.AutoBindingShader; import me.cortex.voxy.client.core.gl.shader.Shader; import me.cortex.voxy.client.core.gl.shader.ShaderType; -import me.cortex.voxy.client.core.rendering.util.PrintfDebugUtil; import me.cortex.voxy.client.core.rendering.util.DownloadStream; +import me.cortex.voxy.client.core.rendering.util.PrintfDebugUtil; import me.cortex.voxy.client.core.rendering.util.UploadStream; import org.lwjgl.opengl.ARBDirectStateAccess; import org.lwjgl.system.MemoryUtil; -import static org.lwjgl.opengl.ARBDirectStateAccess.glCopyNamedBufferSubData; import static org.lwjgl.opengl.GL30C.glBindBufferRange; import static org.lwjgl.opengl.GL42C.glMemoryBarrier; import static org.lwjgl.opengl.GL43C.*; diff --git a/src/main/java/me/cortex/voxy/client/core/rendering/hierachical/NodeManager.java b/src/main/java/me/cortex/voxy/client/core/rendering/hierachical/NodeManager.java index 37a27d7c..c883bf4d 100644 --- a/src/main/java/me/cortex/voxy/client/core/rendering/hierachical/NodeManager.java +++ b/src/main/java/me/cortex/voxy/client/core/rendering/hierachical/NodeManager.java @@ -18,7 +18,6 @@ import me.cortex.voxy.common.world.WorldEngine; import org.lwjgl.system.MemoryUtil; import java.util.List; -import java.util.function.Consumer; import static me.cortex.voxy.common.world.WorldEngine.MAX_LOD_LAYER; import static me.cortex.voxy.common.world.WorldEngine.UPDATE_TYPE_BLOCK_BIT; diff --git a/src/main/java/me/cortex/voxy/client/core/rendering/post/PostProcessing.java b/src/main/java/me/cortex/voxy/client/core/rendering/post/PostProcessing.java index c381909f..2d16d4cd 100644 --- a/src/main/java/me/cortex/voxy/client/core/rendering/post/PostProcessing.java +++ b/src/main/java/me/cortex/voxy/client/core/rendering/post/PostProcessing.java @@ -15,7 +15,6 @@ import static org.lwjgl.opengl.ARBShaderImageLoadStore.glBindImageTexture; import static org.lwjgl.opengl.GL15.GL_READ_WRITE; import static org.lwjgl.opengl.GL20.glUniformMatrix4fv; import static org.lwjgl.opengl.GL30C.*; -import static org.lwjgl.opengl.GL30C.GL_DEPTH24_STENCIL8; import static org.lwjgl.opengl.GL43.GL_DEPTH_STENCIL_TEXTURE_MODE; import static org.lwjgl.opengl.GL45C.*; diff --git a/src/main/java/me/cortex/voxy/client/core/rendering/section/MDICSectionRenderer.java b/src/main/java/me/cortex/voxy/client/core/rendering/section/MDICSectionRenderer.java index 34b89a58..25fd15e7 100644 --- a/src/main/java/me/cortex/voxy/client/core/rendering/section/MDICSectionRenderer.java +++ b/src/main/java/me/cortex/voxy/client/core/rendering/section/MDICSectionRenderer.java @@ -8,11 +8,11 @@ import me.cortex.voxy.client.core.gl.GlTexture; import me.cortex.voxy.client.core.gl.shader.Shader; import me.cortex.voxy.client.core.gl.shader.ShaderType; import me.cortex.voxy.client.core.model.ModelStore; -import me.cortex.voxy.client.core.rendering.section.geometry.BasicSectionGeometryData; -import me.cortex.voxy.client.core.rendering.util.LightMapHelper; import me.cortex.voxy.client.core.rendering.RenderService; -import me.cortex.voxy.client.core.rendering.util.SharedIndexBuffer; +import me.cortex.voxy.client.core.rendering.section.geometry.BasicSectionGeometryData; import me.cortex.voxy.client.core.rendering.util.DownloadStream; +import me.cortex.voxy.client.core.rendering.util.LightMapHelper; +import me.cortex.voxy.client.core.rendering.util.SharedIndexBuffer; import me.cortex.voxy.client.core.rendering.util.UploadStream; import me.cortex.voxy.common.Logger; import me.cortex.voxy.common.world.WorldEngine; @@ -34,7 +34,6 @@ import static org.lwjgl.opengl.GL40C.GL_DRAW_INDIRECT_BUFFER; import static org.lwjgl.opengl.GL42.glMemoryBarrier; import static org.lwjgl.opengl.GL43.*; import static org.lwjgl.opengl.GL45.glBindTextureUnit; -import static org.lwjgl.opengl.GL45.glClearNamedBufferData; import static org.lwjgl.opengl.NVRepresentativeFragmentTest.GL_REPRESENTATIVE_FRAGMENT_TEST_NV; //Uses MDIC to render the sections diff --git a/src/main/java/me/cortex/voxy/client/core/rendering/util/ComputeUtils.java b/src/main/java/me/cortex/voxy/client/core/rendering/util/ComputeUtils.java index 942614e5..9396d702 100644 --- a/src/main/java/me/cortex/voxy/client/core/rendering/util/ComputeUtils.java +++ b/src/main/java/me/cortex/voxy/client/core/rendering/util/ComputeUtils.java @@ -7,12 +7,8 @@ import org.lwjgl.system.MemoryUtil; import java.util.function.Supplier; -import static org.lwjgl.opengl.GL15.glBindBuffer; import static org.lwjgl.opengl.GL20.glUniform1i; -import static org.lwjgl.opengl.GL20.glUseProgram; import static org.lwjgl.opengl.GL30.glBindBufferBase; -import static org.lwjgl.opengl.GL30.glUniform1ui; -import static org.lwjgl.opengl.GL31.GL_UNIFORM_BUFFER; import static org.lwjgl.opengl.GL43.GL_SHADER_STORAGE_BUFFER; import static org.lwjgl.opengl.GL43C.glDispatchCompute; diff --git a/src/main/java/me/cortex/voxy/client/core/rendering/util/DownloadStream.java b/src/main/java/me/cortex/voxy/client/core/rendering/util/DownloadStream.java index 04a6b6c1..e7f9787d 100644 --- a/src/main/java/me/cortex/voxy/client/core/rendering/util/DownloadStream.java +++ b/src/main/java/me/cortex/voxy/client/core/rendering/util/DownloadStream.java @@ -18,7 +18,7 @@ import static org.lwjgl.opengl.GL11.glFinish; import static org.lwjgl.opengl.GL30C.GL_MAP_READ_BIT; import static org.lwjgl.opengl.GL42.GL_BUFFER_UPDATE_BARRIER_BIT; import static org.lwjgl.opengl.GL42.glMemoryBarrier; -import static org.lwjgl.opengl.GL44.*; +import static org.lwjgl.opengl.GL44.GL_CLIENT_MAPPED_BUFFER_BARRIER_BIT; import static org.lwjgl.opengl.GL45.glCopyNamedBufferSubData; public class DownloadStream { diff --git a/src/main/java/me/cortex/voxy/client/core/rendering/util/GlStateCapture.java b/src/main/java/me/cortex/voxy/client/core/rendering/util/GlStateCapture.java index 1a102a88..0abb563f 100644 --- a/src/main/java/me/cortex/voxy/client/core/rendering/util/GlStateCapture.java +++ b/src/main/java/me/cortex/voxy/client/core/rendering/util/GlStateCapture.java @@ -5,8 +5,6 @@ import it.unimi.dsi.fastutil.ints.IntArrayList; import static org.lwjgl.opengl.GL11.*; import static org.lwjgl.opengl.GL13.GL_ACTIVE_TEXTURE; import static org.lwjgl.opengl.GL13.glActiveTexture; -import static org.lwjgl.opengl.GL13C.GL_TEXTURE0; -import static org.lwjgl.opengl.GL33.glBindSampler; public class GlStateCapture { private final int[] capabilityIds; diff --git a/src/main/java/me/cortex/voxy/client/core/rendering/util/HiZBuffer.java b/src/main/java/me/cortex/voxy/client/core/rendering/util/HiZBuffer.java index 800f7523..36a63e83 100644 --- a/src/main/java/me/cortex/voxy/client/core/rendering/util/HiZBuffer.java +++ b/src/main/java/me/cortex/voxy/client/core/rendering/util/HiZBuffer.java @@ -17,7 +17,6 @@ import static org.lwjgl.opengl.GL33C.glDeleteSamplers; import static org.lwjgl.opengl.GL33C.glSamplerParameteri; import static org.lwjgl.opengl.GL42C.GL_FRAMEBUFFER_BARRIER_BIT; import static org.lwjgl.opengl.GL42C.glMemoryBarrier; -import static org.lwjgl.opengl.GL43C.glCopyImageSubData; import static org.lwjgl.opengl.GL45C.glTextureBarrier; public class HiZBuffer { diff --git a/src/main/java/me/cortex/voxy/client/core/rendering/util/HiZBuffer2.java b/src/main/java/me/cortex/voxy/client/core/rendering/util/HiZBuffer2.java index 46aec7a7..5d37c495 100644 --- a/src/main/java/me/cortex/voxy/client/core/rendering/util/HiZBuffer2.java +++ b/src/main/java/me/cortex/voxy/client/core/rendering/util/HiZBuffer2.java @@ -11,7 +11,6 @@ import static org.lwjgl.opengl.ARBDirectStateAccess.*; import static org.lwjgl.opengl.ARBShaderImageLoadStore.GL_TEXTURE_FETCH_BARRIER_BIT; import static org.lwjgl.opengl.GL11C.*; import static org.lwjgl.opengl.GL30C.*; -import static org.lwjgl.opengl.GL30C.glBindVertexArray; import static org.lwjgl.opengl.GL33.glBindSampler; import static org.lwjgl.opengl.GL33.glGenSamplers; import static org.lwjgl.opengl.GL33C.glDeleteSamplers; diff --git a/src/main/java/me/cortex/voxy/client/core/rendering/util/LightMapHelper.java b/src/main/java/me/cortex/voxy/client/core/rendering/util/LightMapHelper.java index fe05e7ab..aed68c1a 100644 --- a/src/main/java/me/cortex/voxy/client/core/rendering/util/LightMapHelper.java +++ b/src/main/java/me/cortex/voxy/client/core/rendering/util/LightMapHelper.java @@ -1,15 +1,8 @@ package me.cortex.voxy.client.core.rendering.util; -import me.cortex.voxy.client.core.gl.GlBuffer; -import me.cortex.voxy.client.core.gl.GlTexture; -import me.cortex.voxy.client.core.rendering.util.UploadStream; import net.minecraft.client.MinecraftClient; -import org.lwjgl.system.MemoryUtil; -import static org.lwjgl.opengl.ARBUniformBufferObject.glBindBufferBase; -import static org.lwjgl.opengl.GL11.glBindTexture; -import static org.lwjgl.opengl.GL33.*; -import static org.lwjgl.opengl.GL43.GL_SHADER_STORAGE_BUFFER; +import static org.lwjgl.opengl.GL33.glBindSampler; import static org.lwjgl.opengl.GL45.glBindTextureUnit; public class LightMapHelper { diff --git a/src/main/java/me/cortex/voxy/client/core/rendering/util/UploadStream.java b/src/main/java/me/cortex/voxy/client/core/rendering/util/UploadStream.java index 032f725f..f3722099 100644 --- a/src/main/java/me/cortex/voxy/client/core/rendering/util/UploadStream.java +++ b/src/main/java/me/cortex/voxy/client/core/rendering/util/UploadStream.java @@ -15,11 +15,8 @@ import static me.cortex.voxy.common.util.AllocationArena.SIZE_LIMIT; import static org.lwjgl.opengl.ARBDirectStateAccess.glCopyNamedBufferSubData; import static org.lwjgl.opengl.ARBMapBufferRange.*; import static org.lwjgl.opengl.GL11.glFinish; -import static org.lwjgl.opengl.GL42.GL_UNIFORM_BARRIER_BIT; import static org.lwjgl.opengl.GL42.glMemoryBarrier; import static org.lwjgl.opengl.GL42C.GL_BUFFER_UPDATE_BARRIER_BIT; -import static org.lwjgl.opengl.GL43.GL_SHADER_STORAGE_BARRIER_BIT; -import static org.lwjgl.opengl.GL44.GL_CLIENT_MAPPED_BUFFER_BARRIER_BIT; import static org.lwjgl.opengl.GL44.GL_MAP_COHERENT_BIT; import static org.lwjgl.opengl.GL45C.glFlushMappedNamedBufferRange; diff --git a/src/main/java/me/cortex/voxy/client/core/util/IrisUtil.java b/src/main/java/me/cortex/voxy/client/core/util/IrisUtil.java index 8c1f255f..4abd27f5 100644 --- a/src/main/java/me/cortex/voxy/client/core/util/IrisUtil.java +++ b/src/main/java/me/cortex/voxy/client/core/util/IrisUtil.java @@ -2,7 +2,6 @@ package me.cortex.voxy.client.core.util; import net.fabricmc.loader.api.FabricLoader; import net.irisshaders.iris.shadows.ShadowRenderer; -import org.spongepowered.asm.mixin.Unique; public class IrisUtil { private static final boolean IRIS_INSTALLED = FabricLoader.getInstance().isModLoaded("iris"); diff --git a/src/main/java/me/cortex/voxy/client/mixin/minecraft/MixinClientLoginNetworkHandler.java b/src/main/java/me/cortex/voxy/client/mixin/minecraft/MixinClientLoginNetworkHandler.java index 8ffbac4b..173b1d41 100644 --- a/src/main/java/me/cortex/voxy/client/mixin/minecraft/MixinClientLoginNetworkHandler.java +++ b/src/main/java/me/cortex/voxy/client/mixin/minecraft/MixinClientLoginNetworkHandler.java @@ -1,23 +1,15 @@ package me.cortex.voxy.client.mixin.minecraft; -import me.cortex.voxy.client.LoadException; import me.cortex.voxy.client.VoxyClientInstance; import me.cortex.voxy.client.config.VoxyConfig; import me.cortex.voxy.commonImpl.VoxyCommon; -import net.minecraft.client.MinecraftClient; -import net.minecraft.client.gui.screen.Screen; -import net.minecraft.client.network.*; -import net.minecraft.network.ClientConnection; -import net.minecraft.network.packet.Packet; +import net.minecraft.client.network.ClientPlayNetworkHandler; import net.minecraft.network.packet.s2c.play.GameJoinS2CPacket; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import java.time.Duration; -import java.util.function.Consumer; - @Mixin(ClientPlayNetworkHandler.class) public class MixinClientLoginNetworkHandler { @Inject(method = "onGameJoin", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/network/ClientPlayerInteractionManager;(Lnet/minecraft/client/MinecraftClient;Lnet/minecraft/client/network/ClientPlayNetworkHandler;)V", shift = At.Shift.BY, by = 2)) diff --git a/src/main/java/me/cortex/voxy/client/mixin/minecraft/MixinWorldRenderer.java b/src/main/java/me/cortex/voxy/client/mixin/minecraft/MixinWorldRenderer.java index f9b31047..2cf670d7 100644 --- a/src/main/java/me/cortex/voxy/client/mixin/minecraft/MixinWorldRenderer.java +++ b/src/main/java/me/cortex/voxy/client/mixin/minecraft/MixinWorldRenderer.java @@ -8,11 +8,10 @@ import me.cortex.voxy.common.Logger; import me.cortex.voxy.common.world.WorldEngine; import me.cortex.voxy.commonImpl.VoxyCommon; import me.cortex.voxy.commonImpl.WorldIdentifier; -import net.minecraft.client.render.*; -import net.minecraft.client.util.ObjectAllocator; +import net.minecraft.client.render.Frustum; +import net.minecraft.client.render.WorldRenderer; import net.minecraft.client.world.ClientWorld; import org.jetbrains.annotations.Nullable; -import org.joml.Matrix4f; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.Unique; diff --git a/src/main/java/me/cortex/voxy/client/mixin/sodium/MixinDefaultChunkRenderer.java b/src/main/java/me/cortex/voxy/client/mixin/sodium/MixinDefaultChunkRenderer.java index d244fca2..b7a36ca3 100644 --- a/src/main/java/me/cortex/voxy/client/mixin/sodium/MixinDefaultChunkRenderer.java +++ b/src/main/java/me/cortex/voxy/client/mixin/sodium/MixinDefaultChunkRenderer.java @@ -10,8 +10,6 @@ import net.caffeinemc.mods.sodium.client.render.chunk.terrain.TerrainRenderPass; import net.caffeinemc.mods.sodium.client.render.viewport.CameraTransform; import net.caffeinemc.mods.sodium.client.util.FogParameters; import net.minecraft.client.MinecraftClient; -import net.minecraft.client.util.math.MatrixStack; -import org.joml.Matrix4f; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; diff --git a/src/main/java/me/cortex/voxy/client/mixin/sodium/MixinRenderSectionManager.java b/src/main/java/me/cortex/voxy/client/mixin/sodium/MixinRenderSectionManager.java index 6e2b6ff9..cdf82a66 100644 --- a/src/main/java/me/cortex/voxy/client/mixin/sodium/MixinRenderSectionManager.java +++ b/src/main/java/me/cortex/voxy/client/mixin/sodium/MixinRenderSectionManager.java @@ -11,9 +11,7 @@ import net.caffeinemc.mods.sodium.client.render.chunk.RenderSectionManager; import net.caffeinemc.mods.sodium.client.render.chunk.data.BuiltSectionInfo; import net.fabricmc.loader.api.FabricLoader; import net.minecraft.client.world.ClientWorld; -import net.minecraft.util.math.ChunkPos; import net.minecraft.util.math.ChunkSectionPos; -import net.minecraft.world.chunk.WorldChunk; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; diff --git a/src/main/java/me/cortex/voxy/client/taskbar/WindowsTaskbar.java b/src/main/java/me/cortex/voxy/client/taskbar/WindowsTaskbar.java index 4b07a340..9c4e4917 100644 --- a/src/main/java/me/cortex/voxy/client/taskbar/WindowsTaskbar.java +++ b/src/main/java/me/cortex/voxy/client/taskbar/WindowsTaskbar.java @@ -1,10 +1,9 @@ package me.cortex.voxy.client.taskbar; import com.sun.jna.Pointer; -import com.sun.jna.platform.win32.*; import com.sun.jna.platform.win32.COM.COMInvoker; +import com.sun.jna.platform.win32.*; import com.sun.jna.ptr.PointerByReference; -import me.cortex.voxy.common.util.TrackedObject; import org.lwjgl.glfw.GLFWNativeWin32; public class WindowsTaskbar extends COMInvoker implements Taskbar.ITaskbar { diff --git a/src/main/java/me/cortex/voxy/common/config/compressors/LZMACompressor.java b/src/main/java/me/cortex/voxy/common/config/compressors/LZMACompressor.java index b1e96f18..3e4796df 100644 --- a/src/main/java/me/cortex/voxy/common/config/compressors/LZMACompressor.java +++ b/src/main/java/me/cortex/voxy/common/config/compressors/LZMACompressor.java @@ -1,17 +1,5 @@ package me.cortex.voxy.common.config.compressors; -import me.cortex.voxy.common.config.ConfigBuildCtx; -import me.cortex.voxy.common.util.MemoryBuffer; -import me.cortex.voxy.common.util.Pair; -import me.cortex.voxy.common.util.ThreadLocalMemoryBuffer; -import me.cortex.voxy.common.util.UnsafeUtil; -import me.cortex.voxy.common.world.SaveLoadSystem; -import org.lwjgl.system.MemoryUtil; -import org.tukaani.xz.*; - -import java.io.IOException; -import java.io.InputStream; - /* public class LZMACompressor implements StorageCompressor { private static final ThreadLocal> CACHE_THREAD_LOCAL = ThreadLocal.withInitial(()->new Pair<>(new byte[SaveLoadSystem.BIGGEST_SERIALIZED_SECTION_SIZE], new ResettableArrayCache(new ArrayCache()))); diff --git a/src/main/java/me/cortex/voxy/common/config/compressors/StorageCompressor.java b/src/main/java/me/cortex/voxy/common/config/compressors/StorageCompressor.java index cf29d32a..cb2e2774 100644 --- a/src/main/java/me/cortex/voxy/common/config/compressors/StorageCompressor.java +++ b/src/main/java/me/cortex/voxy/common/config/compressors/StorageCompressor.java @@ -2,8 +2,6 @@ package me.cortex.voxy.common.config.compressors; import me.cortex.voxy.common.util.MemoryBuffer; -import java.nio.ByteBuffer; - public interface StorageCompressor { MemoryBuffer compress(MemoryBuffer saveData); diff --git a/src/main/java/me/cortex/voxy/common/config/compressors/ZSTDCompressor.java b/src/main/java/me/cortex/voxy/common/config/compressors/ZSTDCompressor.java index c2d24fc8..769bcbb6 100644 --- a/src/main/java/me/cortex/voxy/common/config/compressors/ZSTDCompressor.java +++ b/src/main/java/me/cortex/voxy/common/config/compressors/ZSTDCompressor.java @@ -5,8 +5,6 @@ import me.cortex.voxy.common.util.MemoryBuffer; import me.cortex.voxy.common.util.ThreadLocalMemoryBuffer; import me.cortex.voxy.common.world.SaveLoadSystem; -import java.lang.ref.Cleaner; - import static me.cortex.voxy.common.util.GlobalCleaner.CLEANER; import static org.lwjgl.util.zstd.Zstd.*; diff --git a/src/main/java/me/cortex/voxy/common/config/section/SectionSerializationStorage.java b/src/main/java/me/cortex/voxy/common/config/section/SectionSerializationStorage.java index b5b1c6a9..2a51ea12 100644 --- a/src/main/java/me/cortex/voxy/common/config/section/SectionSerializationStorage.java +++ b/src/main/java/me/cortex/voxy/common/config/section/SectionSerializationStorage.java @@ -7,14 +7,12 @@ import me.cortex.voxy.common.config.storage.StorageBackend; import me.cortex.voxy.common.config.storage.StorageConfig; import me.cortex.voxy.common.util.ThreadLocalMemoryBuffer; import me.cortex.voxy.common.world.SaveLoadSystem; -import me.cortex.voxy.common.world.SaveLoadSystem2; import me.cortex.voxy.common.world.SaveLoadSystem3; import me.cortex.voxy.common.world.WorldSection; import me.cortex.voxy.common.world.other.Mapper; import java.nio.ByteBuffer; import java.util.Arrays; -import java.util.concurrent.atomic.AtomicLong; import java.util.function.LongConsumer; public class SectionSerializationStorage extends SectionStorage { diff --git a/src/main/java/me/cortex/voxy/common/config/storage/StorageBackend.java b/src/main/java/me/cortex/voxy/common/config/storage/StorageBackend.java index 9b0fcb3c..0ce89119 100644 --- a/src/main/java/me/cortex/voxy/common/config/storage/StorageBackend.java +++ b/src/main/java/me/cortex/voxy/common/config/storage/StorageBackend.java @@ -1,13 +1,10 @@ package me.cortex.voxy.common.config.storage; -import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap; import me.cortex.voxy.common.config.IMappingStorage; import me.cortex.voxy.common.util.MemoryBuffer; -import java.nio.ByteBuffer; import java.util.ArrayList; import java.util.List; -import java.util.function.LongConsumer; public abstract class StorageBackend implements IMappingStorage { diff --git a/src/main/java/me/cortex/voxy/common/config/storage/inmemory/MemoryStorageBackend.java b/src/main/java/me/cortex/voxy/common/config/storage/inmemory/MemoryStorageBackend.java index ff34b134..44846de8 100644 --- a/src/main/java/me/cortex/voxy/common/config/storage/inmemory/MemoryStorageBackend.java +++ b/src/main/java/me/cortex/voxy/common/config/storage/inmemory/MemoryStorageBackend.java @@ -5,8 +5,8 @@ import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap; import it.unimi.dsi.fastutil.longs.Long2ObjectMap; import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap; import it.unimi.dsi.fastutil.objects.ObjectCollection; -import me.cortex.voxy.common.config.storage.StorageBackend; import me.cortex.voxy.common.config.ConfigBuildCtx; +import me.cortex.voxy.common.config.storage.StorageBackend; import me.cortex.voxy.common.config.storage.StorageConfig; import me.cortex.voxy.common.util.MemoryBuffer; import net.minecraft.util.math.random.RandomSeed; diff --git a/src/main/java/me/cortex/voxy/common/config/storage/lmdb/LMDBStorageBackend.java b/src/main/java/me/cortex/voxy/common/config/storage/lmdb/LMDBStorageBackend.java index ff586a0c..633f7ec4 100644 --- a/src/main/java/me/cortex/voxy/common/config/storage/lmdb/LMDBStorageBackend.java +++ b/src/main/java/me/cortex/voxy/common/config/storage/lmdb/LMDBStorageBackend.java @@ -2,8 +2,8 @@ package me.cortex.voxy.common.config.storage.lmdb; import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap; import me.cortex.voxy.common.Logger; -import me.cortex.voxy.common.config.storage.StorageBackend; import me.cortex.voxy.common.config.ConfigBuildCtx; +import me.cortex.voxy.common.config.storage.StorageBackend; import me.cortex.voxy.common.config.storage.StorageConfig; import me.cortex.voxy.common.util.MemoryBuffer; import me.cortex.voxy.common.util.UnsafeUtil; @@ -18,7 +18,6 @@ import java.util.function.LongConsumer; import java.util.function.Supplier; import static org.lwjgl.util.lmdb.LMDB.*; -import static org.lwjgl.util.lmdb.LMDB.MDB_NOTFOUND; public class LMDBStorageBackend extends StorageBackend { private static final long GROW_SIZE = 1<<25;//Grow by 33 mb each time diff --git a/src/main/java/me/cortex/voxy/common/config/storage/other/BasicPathInsertionConfig.java b/src/main/java/me/cortex/voxy/common/config/storage/other/BasicPathInsertionConfig.java index 42d9cc80..4242e693 100644 --- a/src/main/java/me/cortex/voxy/common/config/storage/other/BasicPathInsertionConfig.java +++ b/src/main/java/me/cortex/voxy/common/config/storage/other/BasicPathInsertionConfig.java @@ -1,7 +1,7 @@ package me.cortex.voxy.common.config.storage.other; -import me.cortex.voxy.common.config.storage.StorageBackend; import me.cortex.voxy.common.config.ConfigBuildCtx; +import me.cortex.voxy.common.config.storage.StorageBackend; //Very simple config that adds a path to the config builder public class BasicPathInsertionConfig extends DelegateStorageConfig { diff --git a/src/main/java/me/cortex/voxy/common/config/storage/other/CompressionStorageAdaptor.java b/src/main/java/me/cortex/voxy/common/config/storage/other/CompressionStorageAdaptor.java index a33d353e..ffbea7e7 100644 --- a/src/main/java/me/cortex/voxy/common/config/storage/other/CompressionStorageAdaptor.java +++ b/src/main/java/me/cortex/voxy/common/config/storage/other/CompressionStorageAdaptor.java @@ -1,9 +1,9 @@ package me.cortex.voxy.common.config.storage.other; -import me.cortex.voxy.common.config.storage.StorageBackend; -import me.cortex.voxy.common.config.compressors.StorageCompressor; -import me.cortex.voxy.common.config.compressors.CompressorConfig; import me.cortex.voxy.common.config.ConfigBuildCtx; +import me.cortex.voxy.common.config.compressors.CompressorConfig; +import me.cortex.voxy.common.config.compressors.StorageCompressor; +import me.cortex.voxy.common.config.storage.StorageBackend; import me.cortex.voxy.common.util.MemoryBuffer; //Compresses the section data diff --git a/src/main/java/me/cortex/voxy/common/config/storage/other/ConditionalStorageBackendConfig.java b/src/main/java/me/cortex/voxy/common/config/storage/other/ConditionalStorageBackendConfig.java index 49ade75b..55897cad 100644 --- a/src/main/java/me/cortex/voxy/common/config/storage/other/ConditionalStorageBackendConfig.java +++ b/src/main/java/me/cortex/voxy/common/config/storage/other/ConditionalStorageBackendConfig.java @@ -1,7 +1,7 @@ package me.cortex.voxy.common.config.storage.other; -import me.cortex.voxy.common.config.storage.StorageBackend; import me.cortex.voxy.common.config.ConfigBuildCtx; +import me.cortex.voxy.common.config.storage.StorageBackend; import me.cortex.voxy.common.config.storage.StorageConfig; import org.apache.commons.lang3.NotImplementedException; diff --git a/src/main/java/me/cortex/voxy/common/config/storage/other/FragmentedStorageBackendAdaptor.java b/src/main/java/me/cortex/voxy/common/config/storage/other/FragmentedStorageBackendAdaptor.java index 652d0aae..98be4d3f 100644 --- a/src/main/java/me/cortex/voxy/common/config/storage/other/FragmentedStorageBackendAdaptor.java +++ b/src/main/java/me/cortex/voxy/common/config/storage/other/FragmentedStorageBackendAdaptor.java @@ -4,8 +4,8 @@ import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap; import it.unimi.dsi.fastutil.objects.Object2IntMap; import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap; import me.cortex.voxy.common.Logger; -import me.cortex.voxy.common.config.storage.StorageBackend; import me.cortex.voxy.common.config.ConfigBuildCtx; +import me.cortex.voxy.common.config.storage.StorageBackend; import me.cortex.voxy.common.config.storage.StorageConfig; import me.cortex.voxy.common.util.MemoryBuffer; import net.minecraft.util.math.random.RandomSeed; diff --git a/src/main/java/me/cortex/voxy/common/config/storage/other/ReadonlyCachingLayer.java b/src/main/java/me/cortex/voxy/common/config/storage/other/ReadonlyCachingLayer.java index 89a272c3..c203c90d 100644 --- a/src/main/java/me/cortex/voxy/common/config/storage/other/ReadonlyCachingLayer.java +++ b/src/main/java/me/cortex/voxy/common/config/storage/other/ReadonlyCachingLayer.java @@ -1,8 +1,8 @@ package me.cortex.voxy.common.config.storage.other; import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap; -import me.cortex.voxy.common.config.storage.StorageBackend; import me.cortex.voxy.common.config.ConfigBuildCtx; +import me.cortex.voxy.common.config.storage.StorageBackend; import me.cortex.voxy.common.config.storage.StorageConfig; import me.cortex.voxy.common.util.MemoryBuffer; diff --git a/src/main/java/me/cortex/voxy/common/config/storage/redis/RedisStorageBackend.java b/src/main/java/me/cortex/voxy/common/config/storage/redis/RedisStorageBackend.java index 2883b4b4..135b08c6 100644 --- a/src/main/java/me/cortex/voxy/common/config/storage/redis/RedisStorageBackend.java +++ b/src/main/java/me/cortex/voxy/common/config/storage/redis/RedisStorageBackend.java @@ -1,8 +1,8 @@ package me.cortex.voxy.common.config.storage.redis; import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap; -import me.cortex.voxy.common.config.storage.StorageBackend; import me.cortex.voxy.common.config.ConfigBuildCtx; +import me.cortex.voxy.common.config.storage.StorageBackend; import me.cortex.voxy.common.config.storage.StorageConfig; import me.cortex.voxy.common.util.MemoryBuffer; import me.cortex.voxy.common.util.UnsafeUtil; diff --git a/src/main/java/me/cortex/voxy/common/config/storage/rocksdb/RocksDBStorageBackend.java b/src/main/java/me/cortex/voxy/common/config/storage/rocksdb/RocksDBStorageBackend.java index c5d4b3e6..96bb6f05 100644 --- a/src/main/java/me/cortex/voxy/common/config/storage/rocksdb/RocksDBStorageBackend.java +++ b/src/main/java/me/cortex/voxy/common/config/storage/rocksdb/RocksDBStorageBackend.java @@ -1,11 +1,10 @@ package me.cortex.voxy.common.config.storage.rocksdb; import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap; -import me.cortex.voxy.common.config.storage.StorageBackend; import me.cortex.voxy.common.config.ConfigBuildCtx; +import me.cortex.voxy.common.config.storage.StorageBackend; import me.cortex.voxy.common.config.storage.StorageConfig; import me.cortex.voxy.common.util.MemoryBuffer; -import me.cortex.voxy.common.util.UnsafeUtil; import me.cortex.voxy.common.world.WorldEngine; import org.lwjgl.system.MemoryStack; import org.lwjgl.system.MemoryUtil; diff --git a/src/main/java/me/cortex/voxy/common/thread/QueuedServiceSlice.java b/src/main/java/me/cortex/voxy/common/thread/QueuedServiceSlice.java index 5e66726e..d7dabe1b 100644 --- a/src/main/java/me/cortex/voxy/common/thread/QueuedServiceSlice.java +++ b/src/main/java/me/cortex/voxy/common/thread/QueuedServiceSlice.java @@ -1,14 +1,8 @@ package me.cortex.voxy.common.thread; import me.cortex.voxy.common.util.Pair; -import me.cortex.voxy.common.util.TrackedObject; -import me.cortex.voxy.common.world.WorldSection; -import net.minecraft.client.MinecraftClient; -import net.minecraft.text.Text; import java.util.concurrent.ConcurrentLinkedDeque; -import java.util.concurrent.Semaphore; -import java.util.concurrent.atomic.AtomicInteger; import java.util.function.BooleanSupplier; import java.util.function.Consumer; import java.util.function.Supplier; diff --git a/src/main/java/me/cortex/voxy/common/thread/ServiceThreadPool.java b/src/main/java/me/cortex/voxy/common/thread/ServiceThreadPool.java index f754ec2a..9f80b34b 100644 --- a/src/main/java/me/cortex/voxy/common/thread/ServiceThreadPool.java +++ b/src/main/java/me/cortex/voxy/common/thread/ServiceThreadPool.java @@ -5,10 +5,6 @@ import me.cortex.voxy.common.util.Pair; import me.cortex.voxy.common.util.ThreadUtils; import me.cortex.voxy.common.util.cpu.CpuLayout; -import java.lang.invoke.VarHandle; -import java.lang.management.ManagementFactory; -import java.lang.management.ThreadMXBean; -import java.util.Arrays; import java.util.concurrent.Semaphore; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicLong; diff --git a/src/main/java/me/cortex/voxy/common/util/AllocationArena.java b/src/main/java/me/cortex/voxy/common/util/AllocationArena.java index 5bc595db..2d99af6f 100644 --- a/src/main/java/me/cortex/voxy/common/util/AllocationArena.java +++ b/src/main/java/me/cortex/voxy/common/util/AllocationArena.java @@ -1,10 +1,7 @@ package me.cortex.voxy.common.util; -import it.unimi.dsi.fastutil.longs.LongLinkedOpenHashSet; import it.unimi.dsi.fastutil.longs.LongRBTreeSet; -import java.util.Random; - //FIXME: NOTE: if there is a free block of size > 2^30 EVERYTHING BREAKS, need to either increase size // or automatically split and manage multiple blocks which is very painful //OR instead of addr, defer to a long[] and use indicies diff --git a/src/main/java/me/cortex/voxy/common/util/MultiGson.java b/src/main/java/me/cortex/voxy/common/util/MultiGson.java index e7cb221a..0e0ea5a0 100644 --- a/src/main/java/me/cortex/voxy/common/util/MultiGson.java +++ b/src/main/java/me/cortex/voxy/common/util/MultiGson.java @@ -1,6 +1,9 @@ package me.cortex.voxy.common.util; -import com.google.gson.*; +import com.google.gson.FieldNamingPolicy; +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; +import com.google.gson.JsonObject; import java.lang.reflect.Modifier; import java.util.*; diff --git a/src/main/java/me/cortex/voxy/common/util/ThreadLocalMemoryBuffer.java b/src/main/java/me/cortex/voxy/common/util/ThreadLocalMemoryBuffer.java index e86a9fbd..1061747c 100644 --- a/src/main/java/me/cortex/voxy/common/util/ThreadLocalMemoryBuffer.java +++ b/src/main/java/me/cortex/voxy/common/util/ThreadLocalMemoryBuffer.java @@ -1,7 +1,5 @@ package me.cortex.voxy.common.util; -import java.lang.ref.Cleaner; - import static me.cortex.voxy.common.util.GlobalCleaner.CLEANER; public class ThreadLocalMemoryBuffer { diff --git a/src/main/java/me/cortex/voxy/common/util/ThreadUtils.java b/src/main/java/me/cortex/voxy/common/util/ThreadUtils.java index ddd421e3..a7b6d5d4 100644 --- a/src/main/java/me/cortex/voxy/common/util/ThreadUtils.java +++ b/src/main/java/me/cortex/voxy/common/util/ThreadUtils.java @@ -1,11 +1,7 @@ package me.cortex.voxy.common.util; -import org.lwjgl.system.JNI; -import org.lwjgl.system.MemoryStack; -import org.lwjgl.system.MemoryUtil; -import org.lwjgl.system.Platform; +import org.lwjgl.system.*; import org.lwjgl.system.windows.Kernel32; -import org.lwjgl.system.APIUtil; //Platform specific code to assist in thread utilities public class ThreadUtils { diff --git a/src/main/java/me/cortex/voxy/common/util/cpu/CpuLayout.java b/src/main/java/me/cortex/voxy/common/util/cpu/CpuLayout.java index a57b59db..bf1a431a 100644 --- a/src/main/java/me/cortex/voxy/common/util/cpu/CpuLayout.java +++ b/src/main/java/me/cortex/voxy/common/util/cpu/CpuLayout.java @@ -2,7 +2,6 @@ package me.cortex.voxy.common.util.cpu; import com.sun.jna.platform.win32.Kernel32Util; import com.sun.jna.platform.win32.WinNT; -import it.unimi.dsi.fastutil.ints.Int2LongOpenHashMap; import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap; import me.cortex.voxy.common.Logger; import me.cortex.voxy.common.util.ThreadUtils; diff --git a/src/main/java/me/cortex/voxy/common/voxelization/VoxelizedSection.java b/src/main/java/me/cortex/voxy/common/voxelization/VoxelizedSection.java index f741a062..dcf93a5f 100644 --- a/src/main/java/me/cortex/voxy/common/voxelization/VoxelizedSection.java +++ b/src/main/java/me/cortex/voxy/common/voxelization/VoxelizedSection.java @@ -1,8 +1,6 @@ package me.cortex.voxy.common.voxelization; -import me.cortex.voxy.common.world.other.Mapper; - import java.util.Arrays; //16x16x16 block section diff --git a/src/main/java/me/cortex/voxy/common/voxelization/WorldConversionFactory.java b/src/main/java/me/cortex/voxy/common/voxelization/WorldConversionFactory.java index 6403c251..e75c2be4 100644 --- a/src/main/java/me/cortex/voxy/common/voxelization/WorldConversionFactory.java +++ b/src/main/java/me/cortex/voxy/common/voxelization/WorldConversionFactory.java @@ -1,10 +1,8 @@ package me.cortex.voxy.common.voxelization; import it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap; -import me.cortex.voxy.common.Logger; -import me.cortex.voxy.common.util.Pair; -import me.cortex.voxy.common.world.other.Mipper; import me.cortex.voxy.common.world.other.Mapper; +import me.cortex.voxy.common.world.other.Mipper; import net.caffeinemc.mods.lithium.common.world.chunk.LithiumHashPalette; import net.fabricmc.loader.api.FabricLoader; import net.minecraft.block.BlockState; diff --git a/src/main/java/me/cortex/voxy/common/world/ActiveSectionTracker.java b/src/main/java/me/cortex/voxy/common/world/ActiveSectionTracker.java index bb690af6..9d7d1e20 100644 --- a/src/main/java/me/cortex/voxy/common/world/ActiveSectionTracker.java +++ b/src/main/java/me/cortex/voxy/common/world/ActiveSectionTracker.java @@ -5,7 +5,6 @@ import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap; import me.cortex.voxy.common.Logger; import org.jetbrains.annotations.Nullable; -import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles; import java.lang.invoke.VarHandle; import java.util.Arrays; diff --git a/src/main/java/me/cortex/voxy/common/world/SaveLoadSystem.java b/src/main/java/me/cortex/voxy/common/world/SaveLoadSystem.java index 0e2cdfc9..5a589395 100644 --- a/src/main/java/me/cortex/voxy/common/world/SaveLoadSystem.java +++ b/src/main/java/me/cortex/voxy/common/world/SaveLoadSystem.java @@ -8,8 +8,6 @@ import me.cortex.voxy.common.world.other.Mapper; import me.cortex.voxy.commonImpl.VoxyCommon; import org.lwjgl.system.MemoryUtil; -import static org.lwjgl.util.zstd.Zstd.*; - public class SaveLoadSystem { public static final boolean VERIFY_HASH_ON_LOAD = VoxyCommon.isVerificationFlagOn("verifySectionHash"); public static final boolean VERIFY_MEMORY_ACCESS = VoxyCommon.isVerificationFlagOn("verifyMemoryAccess"); diff --git a/src/main/java/me/cortex/voxy/common/world/SaveLoadSystem2.java b/src/main/java/me/cortex/voxy/common/world/SaveLoadSystem2.java index d6c01ca4..7e89e254 100644 --- a/src/main/java/me/cortex/voxy/common/world/SaveLoadSystem2.java +++ b/src/main/java/me/cortex/voxy/common/world/SaveLoadSystem2.java @@ -1,14 +1,10 @@ package me.cortex.voxy.common.world; import it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap; -import it.unimi.dsi.fastutil.ints.Int2ShortOpenHashMap; -import it.unimi.dsi.fastutil.longs.Long2IntOpenHashMap; -import it.unimi.dsi.fastutil.longs.Long2ShortOpenHashMap; import me.cortex.voxy.common.Logger; import me.cortex.voxy.common.util.MemoryBuffer; import me.cortex.voxy.common.util.UnsafeUtil; import me.cortex.voxy.common.world.other.Mapper; -import me.cortex.voxy.commonImpl.VoxyCommon; import net.minecraft.util.math.MathHelper; import org.lwjgl.system.MemoryUtil; diff --git a/src/main/java/me/cortex/voxy/common/world/SaveLoadSystem3.java b/src/main/java/me/cortex/voxy/common/world/SaveLoadSystem3.java index 5c918501..5467e31c 100644 --- a/src/main/java/me/cortex/voxy/common/world/SaveLoadSystem3.java +++ b/src/main/java/me/cortex/voxy/common/world/SaveLoadSystem3.java @@ -4,9 +4,7 @@ import it.unimi.dsi.fastutil.longs.Long2ShortOpenHashMap; import me.cortex.voxy.common.Logger; import me.cortex.voxy.common.util.MemoryBuffer; import me.cortex.voxy.common.util.ThreadLocalMemoryBuffer; -import me.cortex.voxy.common.util.UnsafeUtil; import me.cortex.voxy.common.world.other.Mapper; -import me.cortex.voxy.commonImpl.VoxyCommon; import org.lwjgl.system.MemoryUtil; public class SaveLoadSystem3 { diff --git a/src/main/java/me/cortex/voxy/common/world/WorldSection.java b/src/main/java/me/cortex/voxy/common/world/WorldSection.java index 1d33eda9..2921d86e 100644 --- a/src/main/java/me/cortex/voxy/common/world/WorldSection.java +++ b/src/main/java/me/cortex/voxy/common/world/WorldSection.java @@ -5,11 +5,8 @@ import me.cortex.voxy.commonImpl.VoxyCommon; import java.lang.invoke.MethodHandles; import java.lang.invoke.VarHandle; -import java.util.ArrayDeque; import java.util.Arrays; -import java.util.Deque; import java.util.concurrent.ConcurrentLinkedDeque; -import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; //Represents a loaded world section at a specific detail level diff --git a/src/main/java/me/cortex/voxy/common/world/other/Mapper.java b/src/main/java/me/cortex/voxy/common/world/other/Mapper.java index 377d913d..81efcb30 100644 --- a/src/main/java/me/cortex/voxy/common/world/other/Mapper.java +++ b/src/main/java/me/cortex/voxy/common/world/other/Mapper.java @@ -3,7 +3,6 @@ package me.cortex.voxy.common.world.other; import it.unimi.dsi.fastutil.objects.ObjectArrayList; import me.cortex.voxy.common.Logger; import me.cortex.voxy.common.config.IMappingStorage; -import me.cortex.voxy.common.config.section.SectionStorage; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; @@ -21,7 +20,10 @@ import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.nio.ByteBuffer; -import java.util.*; +import java.util.ArrayList; +import java.util.Comparator; +import java.util.List; +import java.util.Random; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.locks.ReentrantLock; import java.util.function.Consumer; diff --git a/src/main/java/me/cortex/voxy/common/world/service/SectionSavingService.java b/src/main/java/me/cortex/voxy/common/world/service/SectionSavingService.java index 86479664..a3a880c8 100644 --- a/src/main/java/me/cortex/voxy/common/world/service/SectionSavingService.java +++ b/src/main/java/me/cortex/voxy/common/world/service/SectionSavingService.java @@ -1,13 +1,10 @@ package me.cortex.voxy.common.world.service; import me.cortex.voxy.common.Logger; -import me.cortex.voxy.common.world.SaveLoadSystem; -import me.cortex.voxy.common.world.WorldEngine; -import me.cortex.voxy.common.world.WorldSection; import me.cortex.voxy.common.thread.ServiceSlice; import me.cortex.voxy.common.thread.ServiceThreadPool; -import net.minecraft.client.MinecraftClient; -import net.minecraft.text.Text; +import me.cortex.voxy.common.world.WorldEngine; +import me.cortex.voxy.common.world.WorldSection; import java.util.concurrent.ConcurrentLinkedDeque; diff --git a/src/main/java/me/cortex/voxy/common/world/service/VoxelIngestService.java b/src/main/java/me/cortex/voxy/common/world/service/VoxelIngestService.java index d2c27ce7..6bf28192 100644 --- a/src/main/java/me/cortex/voxy/common/world/service/VoxelIngestService.java +++ b/src/main/java/me/cortex/voxy/common/world/service/VoxelIngestService.java @@ -1,18 +1,17 @@ package me.cortex.voxy.common.world.service; import me.cortex.voxy.common.Logger; +import me.cortex.voxy.common.thread.ServiceSlice; +import me.cortex.voxy.common.thread.ServiceThreadPool; import me.cortex.voxy.common.voxelization.ILightingSupplier; import me.cortex.voxy.common.voxelization.VoxelizedSection; import me.cortex.voxy.common.voxelization.WorldConversionFactory; import me.cortex.voxy.common.world.WorldEngine; -import me.cortex.voxy.common.thread.ServiceSlice; -import me.cortex.voxy.common.thread.ServiceThreadPool; import me.cortex.voxy.common.world.WorldUpdater; import me.cortex.voxy.commonImpl.VoxyCommon; import me.cortex.voxy.commonImpl.WorldIdentifier; import net.minecraft.util.math.ChunkSectionPos; import net.minecraft.world.LightType; -import net.minecraft.world.chunk.Chunk; import net.minecraft.world.chunk.ChunkNibbleArray; import net.minecraft.world.chunk.ChunkSection; import net.minecraft.world.chunk.WorldChunk; diff --git a/src/main/java/me/cortex/voxy/commonImpl/importers/DHImporter.java b/src/main/java/me/cortex/voxy/commonImpl/importers/DHImporter.java index 3265de2e..58ba93a6 100644 --- a/src/main/java/me/cortex/voxy/commonImpl/importers/DHImporter.java +++ b/src/main/java/me/cortex/voxy/commonImpl/importers/DHImporter.java @@ -9,7 +9,6 @@ import me.cortex.voxy.common.voxelization.WorldConversionFactory; import me.cortex.voxy.common.world.WorldEngine; import me.cortex.voxy.common.world.WorldUpdater; import me.cortex.voxy.common.world.other.Mapper; -import me.cortex.voxy.common.world.service.SectionSavingService; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; diff --git a/src/main/java/me/cortex/voxy/commonImpl/importers/WorldImporter.java b/src/main/java/me/cortex/voxy/commonImpl/importers/WorldImporter.java index ae7da6f7..3a7454de 100644 --- a/src/main/java/me/cortex/voxy/commonImpl/importers/WorldImporter.java +++ b/src/main/java/me/cortex/voxy/commonImpl/importers/WorldImporter.java @@ -2,19 +2,20 @@ package me.cortex.voxy.commonImpl.importers; import com.mojang.serialization.Codec; import me.cortex.voxy.common.Logger; +import me.cortex.voxy.common.thread.ServiceSlice; +import me.cortex.voxy.common.thread.ServiceThreadPool; import me.cortex.voxy.common.util.MemoryBuffer; import me.cortex.voxy.common.util.UnsafeUtil; import me.cortex.voxy.common.voxelization.VoxelizedSection; import me.cortex.voxy.common.voxelization.WorldConversionFactory; import me.cortex.voxy.common.world.WorldEngine; -import me.cortex.voxy.common.thread.ServiceSlice; -import me.cortex.voxy.common.thread.ServiceThreadPool; import me.cortex.voxy.common.world.WorldUpdater; -import me.cortex.voxy.common.world.service.SectionSavingService; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; -import net.minecraft.nbt.*; +import net.minecraft.nbt.NbtCompound; +import net.minecraft.nbt.NbtIo; +import net.minecraft.nbt.NbtOps; import net.minecraft.network.PacketByteBuf; import net.minecraft.registry.RegistryKeys; import net.minecraft.registry.entry.RegistryEntry; @@ -31,7 +32,10 @@ import org.apache.commons.compress.archivers.zip.ZipArchiveEntry; import org.apache.commons.compress.archivers.zip.ZipFile; import org.lwjgl.system.MemoryUtil; -import java.io.*; +import java.io.DataInputStream; +import java.io.File; +import java.io.IOException; +import java.io.InputStream; import java.nio.channels.Channels; import java.nio.channels.FileChannel; import java.nio.file.StandardOpenOption; diff --git a/src/main/java/me/cortex/voxy/commonImpl/mixin/chunky/MixinFabricWorld.java b/src/main/java/me/cortex/voxy/commonImpl/mixin/chunky/MixinFabricWorld.java index 1ed72c3c..6fe7a5e9 100644 --- a/src/main/java/me/cortex/voxy/commonImpl/mixin/chunky/MixinFabricWorld.java +++ b/src/main/java/me/cortex/voxy/commonImpl/mixin/chunky/MixinFabricWorld.java @@ -3,8 +3,6 @@ package me.cortex.voxy.commonImpl.mixin.chunky; import com.llamalad7.mixinextras.injector.wrapoperation.Operation; import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation; import me.cortex.voxy.common.world.service.VoxelIngestService; -import me.cortex.voxy.commonImpl.VoxyCommon; -import me.cortex.voxy.commonImpl.WorldIdentifier; import net.minecraft.server.world.OptionalChunk; import net.minecraft.world.chunk.Chunk; import net.minecraft.world.chunk.ChunkStatus; diff --git a/src/main/java/me/cortex/voxy/commonImpl/mixin/minecraft/MixinWorld.java b/src/main/java/me/cortex/voxy/commonImpl/mixin/minecraft/MixinWorld.java index 75664703..885615f1 100644 --- a/src/main/java/me/cortex/voxy/commonImpl/mixin/minecraft/MixinWorld.java +++ b/src/main/java/me/cortex/voxy/commonImpl/mixin/minecraft/MixinWorld.java @@ -8,7 +8,6 @@ import net.minecraft.registry.entry.RegistryEntry; import net.minecraft.world.MutableWorldProperties; import net.minecraft.world.World; import net.minecraft.world.dimension.DimensionType; -import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Unique; import org.spongepowered.asm.mixin.injection.At;