From a0f9b78162e5a578b74810f50034e3912418a7ed Mon Sep 17 00:00:00 2001 From: mcrcortex <18544518+MCRcortex@users.noreply.github.com> Date: Thu, 14 Aug 2025 22:20:45 +1000 Subject: [PATCH] java imports cleanup --- src/main/java/me/cortex/voxy/client/VoxyClient.java | 1 - .../java/me/cortex/voxy/client/VoxyClientInstance.java | 2 -- .../cortex/voxy/client/core/AbstractRenderPipeline.java | 1 - .../me/cortex/voxy/client/core/NormalRenderPipeline.java | 8 +------- src/main/java/me/cortex/voxy/client/core/gl/GlBuffer.java | 1 - .../voxy/client/core/model/ModelBakerySubsystem.java | 4 ---- .../java/me/cortex/voxy/client/core/model/ModelStore.java | 1 - .../voxy/client/core/model/bakery/GlViewCapture.java | 3 ++- .../voxy/client/core/rendering/ChunkBoundRenderer.java | 3 --- .../core/rendering/hierachical/AsyncNodeManager.java | 1 - .../hierachical/HierarchicalOcclusionTraverser.java | 1 - .../core/rendering/section/AbstractSectionRenderer.java | 1 - .../voxy/client/core/rendering/util/DepthFramebuffer.java | 4 ---- 13 files changed, 3 insertions(+), 28 deletions(-) diff --git a/src/main/java/me/cortex/voxy/client/VoxyClient.java b/src/main/java/me/cortex/voxy/client/VoxyClient.java index 024ff8c4..b07d2be7 100644 --- a/src/main/java/me/cortex/voxy/client/VoxyClient.java +++ b/src/main/java/me/cortex/voxy/client/VoxyClient.java @@ -7,7 +7,6 @@ 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.event.lifecycle.v1.ClientLifecycleEvents; import net.fabricmc.loader.api.FabricLoader; import java.util.HashSet; diff --git a/src/main/java/me/cortex/voxy/client/VoxyClientInstance.java b/src/main/java/me/cortex/voxy/client/VoxyClientInstance.java index 38bf3aae..c9256454 100644 --- a/src/main/java/me/cortex/voxy/client/VoxyClientInstance.java +++ b/src/main/java/me/cortex/voxy/client/VoxyClientInstance.java @@ -18,8 +18,6 @@ import net.minecraft.util.WorldSavePath; import java.nio.file.Files; import java.nio.file.Path; -import java.security.MessageDigest; -import java.security.NoSuchAlgorithmException; public class VoxyClientInstance extends VoxyInstance { public static boolean isInGame = false; diff --git a/src/main/java/me/cortex/voxy/client/core/AbstractRenderPipeline.java b/src/main/java/me/cortex/voxy/client/core/AbstractRenderPipeline.java index 0ef1ccb6..7c932c33 100644 --- a/src/main/java/me/cortex/voxy/client/core/AbstractRenderPipeline.java +++ b/src/main/java/me/cortex/voxy/client/core/AbstractRenderPipeline.java @@ -12,7 +12,6 @@ import me.cortex.voxy.client.core.rendering.section.AbstractSectionRenderer; import me.cortex.voxy.client.core.rendering.util.DownloadStream; import me.cortex.voxy.common.util.TrackedObject; import org.joml.Matrix4f; -import org.joml.Matrix4fc; import org.lwjgl.opengl.GL30; import org.lwjgl.system.MemoryUtil; diff --git a/src/main/java/me/cortex/voxy/client/core/NormalRenderPipeline.java b/src/main/java/me/cortex/voxy/client/core/NormalRenderPipeline.java index aa023787..7eb5421b 100644 --- a/src/main/java/me/cortex/voxy/client/core/NormalRenderPipeline.java +++ b/src/main/java/me/cortex/voxy/client/core/NormalRenderPipeline.java @@ -12,24 +12,18 @@ import me.cortex.voxy.client.core.rendering.hierachical.NodeCleaner; import me.cortex.voxy.client.core.rendering.post.FullscreenBlit; import me.cortex.voxy.client.core.rendering.util.DepthFramebuffer; import org.joml.Matrix4f; -import org.joml.Matrix4fc; -import org.lwjgl.opengl.GL30; import org.lwjgl.system.MemoryStack; import java.util.function.BooleanSupplier; import static org.lwjgl.opengl.ARBComputeShader.glDispatchCompute; import static org.lwjgl.opengl.ARBShaderImageLoadStore.glBindImageTexture; -import static org.lwjgl.opengl.GL11.GL_COLOR_BUFFER_BIT; -import static org.lwjgl.opengl.GL11.GL_DEPTH_BUFFER_BIT; import static org.lwjgl.opengl.GL11C.GL_NEAREST; import static org.lwjgl.opengl.GL11C.GL_RGBA8; 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_FRAMEBUFFER; import static org.lwjgl.opengl.GL43.GL_DEPTH_STENCIL_TEXTURE_MODE; -import static org.lwjgl.opengl.GL45C.*; +import static org.lwjgl.opengl.GL45C.glBindTextureUnit; import static org.lwjgl.opengl.GL45C.glTextureParameterf; public class NormalRenderPipeline extends AbstractRenderPipeline { 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 fb224151..57b9e615 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 @@ -2,7 +2,6 @@ package me.cortex.voxy.client.core.gl; import me.cortex.voxy.common.util.TrackedObject; import org.lwjgl.opengl.GL11; -import org.lwjgl.system.MemoryStack; import org.lwjgl.system.MemoryUtil; import static org.lwjgl.opengl.GL11.GL_UNSIGNED_BYTE; 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 fcf2d875..67e7dac9 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 @@ -4,7 +4,6 @@ package me.cortex.voxy.client.core.model; import it.unimi.dsi.fastutil.ints.IntOpenHashSet; import me.cortex.voxy.common.world.other.Mapper; import net.minecraft.client.MinecraftClient; -import net.minecraft.client.texture.SpriteAtlasTexture; import net.minecraft.registry.RegistryKeys; import net.minecraft.util.Identifier; @@ -12,11 +11,8 @@ import java.util.List; import java.util.concurrent.ConcurrentLinkedDeque; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.locks.ReentrantLock; -import java.util.concurrent.locks.StampedLock; -import static org.lwjgl.opengl.ARBDirectStateAccess.glTextureParameterf; import static org.lwjgl.opengl.GL11.glGetInteger; -import static org.lwjgl.opengl.GL12.GL_TEXTURE_MAX_LOD; import static org.lwjgl.opengl.GL30.GL_FRAMEBUFFER; import static org.lwjgl.opengl.GL30.GL_FRAMEBUFFER_BINDING; import static org.lwjgl.opengl.GL30C.glBindFramebuffer; diff --git a/src/main/java/me/cortex/voxy/client/core/model/ModelStore.java b/src/main/java/me/cortex/voxy/client/core/model/ModelStore.java index 90bb4901..0d51f09e 100644 --- a/src/main/java/me/cortex/voxy/client/core/model/ModelStore.java +++ b/src/main/java/me/cortex/voxy/client/core/model/ModelStore.java @@ -6,7 +6,6 @@ import net.minecraft.client.MinecraftClient; import net.minecraft.client.texture.SpriteAtlasTexture; import net.minecraft.util.Identifier; -import static org.lwjgl.opengl.ARBDirectStateAccess.glTextureParameterf; import static org.lwjgl.opengl.GL11.*; import static org.lwjgl.opengl.GL11C.GL_NEAREST; import static org.lwjgl.opengl.GL11C.GL_NEAREST_MIPMAP_LINEAR; 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 8931369d..dabd36a4 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 @@ -7,7 +7,8 @@ import me.cortex.voxy.client.core.gl.shader.ShaderType; import org.lwjgl.system.MemoryStack; import org.lwjgl.system.MemoryUtil; -import static org.lwjgl.opengl.ARBDirectStateAccess.*; +import static org.lwjgl.opengl.ARBDirectStateAccess.glTextureParameteri; +import static org.lwjgl.opengl.ARBDirectStateAccess.nglClearNamedFramebufferfv; import static org.lwjgl.opengl.ARBShaderImageLoadStore.GL_FRAMEBUFFER_BARRIER_BIT; import static org.lwjgl.opengl.ARBShaderImageLoadStore.GL_PIXEL_BUFFER_BARRIER_BIT; import static org.lwjgl.opengl.ARBShaderImageLoadStore.GL_SHADER_IMAGE_ACCESS_BARRIER_BIT; 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 01073ecf..b69bd8b0 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 @@ -3,8 +3,6 @@ package me.cortex.voxy.client.core.rendering; import it.unimi.dsi.fastutil.longs.Long2IntOpenHashMap; import it.unimi.dsi.fastutil.longs.LongOpenHashSet; 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.GlVertexArray; import me.cortex.voxy.client.core.gl.shader.AutoBindingShader; import me.cortex.voxy.client.core.gl.shader.Shader; @@ -28,7 +26,6 @@ import static org.lwjgl.opengl.GL30.glBindVertexArray; import static org.lwjgl.opengl.GL30C.*; import static org.lwjgl.opengl.GL31.glDrawElementsInstanced; import static org.lwjgl.opengl.GL42.glDrawElementsInstancedBaseInstance; -import static org.lwjgl.opengl.GL45.glClearNamedFramebufferfv; //This is a render subsystem, its very simple in what it does // it renders an AABB around loaded chunks, thats it 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 bf63608d..dc1bec47 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 @@ -20,7 +20,6 @@ import me.cortex.voxy.common.Logger; import me.cortex.voxy.common.util.AllocationArena; import me.cortex.voxy.common.util.MemoryBuffer; import me.cortex.voxy.common.util.UnsafeUtil; -import me.cortex.voxy.common.world.WorldEngine; import me.cortex.voxy.common.world.WorldSection; import org.lwjgl.system.MemoryUtil; diff --git a/src/main/java/me/cortex/voxy/client/core/rendering/hierachical/HierarchicalOcclusionTraverser.java b/src/main/java/me/cortex/voxy/client/core/rendering/hierachical/HierarchicalOcclusionTraverser.java index 39de83b1..d2e29e2f 100644 --- a/src/main/java/me/cortex/voxy/client/core/rendering/hierachical/HierarchicalOcclusionTraverser.java +++ b/src/main/java/me/cortex/voxy/client/core/rendering/hierachical/HierarchicalOcclusionTraverser.java @@ -15,7 +15,6 @@ import me.cortex.voxy.client.core.rendering.util.UploadStream; import me.cortex.voxy.common.Logger; import me.cortex.voxy.common.util.MemoryBuffer; import me.cortex.voxy.common.world.WorldEngine; -import org.lwjgl.system.MemoryStack; import org.lwjgl.system.MemoryUtil; import static me.cortex.voxy.client.core.rendering.util.PrintfDebugUtil.PRINTF_processor; diff --git a/src/main/java/me/cortex/voxy/client/core/rendering/section/AbstractSectionRenderer.java b/src/main/java/me/cortex/voxy/client/core/rendering/section/AbstractSectionRenderer.java index 28c36060..a3417611 100644 --- a/src/main/java/me/cortex/voxy/client/core/rendering/section/AbstractSectionRenderer.java +++ b/src/main/java/me/cortex/voxy/client/core/rendering/section/AbstractSectionRenderer.java @@ -1,7 +1,6 @@ package me.cortex.voxy.client.core.rendering.section; -import me.cortex.voxy.client.core.gl.GlTexture; import me.cortex.voxy.client.core.model.ModelStore; import me.cortex.voxy.client.core.rendering.Viewport; import me.cortex.voxy.client.core.rendering.section.geometry.IGeometryData; diff --git a/src/main/java/me/cortex/voxy/client/core/rendering/util/DepthFramebuffer.java b/src/main/java/me/cortex/voxy/client/core/rendering/util/DepthFramebuffer.java index 1bc0bcaf..bfba4b98 100644 --- a/src/main/java/me/cortex/voxy/client/core/rendering/util/DepthFramebuffer.java +++ b/src/main/java/me/cortex/voxy/client/core/rendering/util/DepthFramebuffer.java @@ -2,13 +2,9 @@ package me.cortex.voxy.client.core.rendering.util; import me.cortex.voxy.client.core.gl.GlFramebuffer; import me.cortex.voxy.client.core.gl.GlTexture; -import org.lwjgl.opengl.GL11C; -import org.lwjgl.opengl.GL14C; import org.lwjgl.system.MemoryStack; -import static org.lwjgl.opengl.ARBDirectStateAccess.glClearNamedFramebufferfv; import static org.lwjgl.opengl.ARBDirectStateAccess.nglClearNamedFramebufferfv; -import static org.lwjgl.opengl.GL11.GL_DEPTH_COMPONENT; import static org.lwjgl.opengl.GL11C.GL_DEPTH; import static org.lwjgl.opengl.GL14.GL_DEPTH_COMPONENT24; import static org.lwjgl.opengl.GL30C.*;