Optimize imports

src/main/java/com/jozufozu/flywheel/backend/Backend.java

@@ -16,7 +16,6 @@ import org.lwjgl.opengl.GLCapabilities;
 import com.jozufozu.flywheel.backend.gl.versioned.GlCompat;
 import com.jozufozu.flywheel.backend.instancing.InstanceData;
 import com.jozufozu.flywheel.backend.material.MaterialSpec;
-import com.jozufozu.flywheel.backend.source.ShaderSources;
 import com.jozufozu.flywheel.config.FlwConfig;
 import com.jozufozu.flywheel.core.shader.spec.ProgramSpec;
 

src/main/java/com/jozufozu/flywheel/backend/OptifineHandler.java

@@ -2,7 +2,6 @@ package com.jozufozu.flywheel.backend;
 
 import java.io.BufferedReader;
 import java.io.File;
-import java.io.FileNotFoundException;
 import java.io.FileReader;
 import java.io.IOException;
 import java.util.Optional;

src/main/java/com/jozufozu/flywheel/backend/gl/attrib/VertexAttribSpec.java

@@ -1,8 +1,6 @@
 package com.jozufozu.flywheel.backend.gl.attrib;
 
 import org.lwjgl.opengl.GL20;
-import org.lwjgl.opengl.GL44;
-import org.lwjgl.opengl.GL46;
 
 import com.jozufozu.flywheel.backend.gl.GlNumericType;
 

src/main/java/com/jozufozu/flywheel/backend/gl/buffer/PersistentGlBuffer.java

@@ -1,6 +1,8 @@
 package com.jozufozu.flywheel.backend.gl.buffer;
 
-import static org.lwjgl.opengl.GL44.*;
+import static org.lwjgl.opengl.GL44.GL_MAP_COHERENT_BIT;
+import static org.lwjgl.opengl.GL44.GL_MAP_PERSISTENT_BIT;
+import static org.lwjgl.opengl.GL44.GL_MAP_WRITE_BIT;
 
 import java.nio.ByteBuffer;
 

src/main/java/com/jozufozu/flywheel/backend/gl/versioned/GlCompat.java

@@ -11,8 +11,8 @@ import org.lwjgl.system.MemoryUtil;
 
 import com.jozufozu.flywheel.backend.gl.versioned.framebuffer.Blit;
 import com.jozufozu.flywheel.backend.gl.versioned.framebuffer.Framebuffer;
-import com.jozufozu.flywheel.backend.gl.versioned.instancing.DrawInstanced;
 import com.jozufozu.flywheel.backend.gl.versioned.instancing.BaseVertex;
+import com.jozufozu.flywheel.backend.gl.versioned.instancing.DrawInstanced;
 import com.jozufozu.flywheel.backend.gl.versioned.instancing.InstancedArrays;
 import com.jozufozu.flywheel.backend.gl.versioned.instancing.VertexArrayObject;
 

src/main/java/com/jozufozu/flywheel/backend/gl/versioned/instancing/BaseVertex.java

@@ -1,8 +1,6 @@
 package com.jozufozu.flywheel.backend.gl.versioned.instancing;
 
 import org.lwjgl.opengl.ARBDrawElementsBaseVertex;
-import org.lwjgl.opengl.ARBDrawInstanced;
-import org.lwjgl.opengl.EXTDrawInstanced;
 import org.lwjgl.opengl.GL32;
 import org.lwjgl.opengl.GLCapabilities;
 

src/main/java/com/jozufozu/flywheel/backend/gl/versioned/instancing/DrawInstanced.java

@@ -3,7 +3,6 @@ package com.jozufozu.flywheel.backend.gl.versioned.instancing;
 import org.lwjgl.opengl.ARBDrawInstanced;
 import org.lwjgl.opengl.EXTDrawInstanced;
 import org.lwjgl.opengl.GL31;
-import org.lwjgl.opengl.GL46;
 import org.lwjgl.opengl.GLCapabilities;
 
 import com.jozufozu.flywheel.backend.gl.GlNumericType;

src/main/java/com/jozufozu/flywheel/backend/instancing/AbstractInstance.java

@@ -7,9 +7,9 @@ import com.jozufozu.flywheel.backend.instancing.tile.TileInstanceManager;
 import com.jozufozu.flywheel.backend.material.MaterialManager;
 import com.jozufozu.flywheel.core.materials.IFlatLight;
 import com.jozufozu.flywheel.light.ILightUpdateListener;
+import com.jozufozu.flywheel.light.ImmutableBox;
 import com.jozufozu.flywheel.light.LightProvider;
 import com.jozufozu.flywheel.light.ListenerStatus;
-import com.jozufozu.flywheel.light.ImmutableBox;
 
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.LightType;

src/main/java/com/jozufozu/flywheel/backend/instancing/GPUInstancer.java

@@ -9,8 +9,8 @@ import com.jozufozu.flywheel.backend.gl.attrib.VertexFormat;
 import com.jozufozu.flywheel.backend.gl.buffer.GlBuffer;
 import com.jozufozu.flywheel.backend.gl.buffer.GlBufferType;
 import com.jozufozu.flywheel.backend.gl.buffer.MappedBuffer;
-import com.jozufozu.flywheel.backend.model.ModelAllocator;
 import com.jozufozu.flywheel.backend.model.IBufferedModel;
+import com.jozufozu.flywheel.backend.model.ModelAllocator;
 import com.jozufozu.flywheel.core.model.IModel;
 import com.jozufozu.flywheel.util.AttribUtil;
 

src/main/java/com/jozufozu/flywheel/backend/instancing/entity/EntityInstance.java

@@ -1,7 +1,7 @@
 package com.jozufozu.flywheel.backend.instancing.entity;
 
-import com.jozufozu.flywheel.backend.instancing.IDynamicInstance;
 import com.jozufozu.flywheel.backend.instancing.AbstractInstance;
+import com.jozufozu.flywheel.backend.instancing.IDynamicInstance;
 import com.jozufozu.flywheel.backend.instancing.ITickableInstance;
 import com.jozufozu.flywheel.backend.instancing.tile.TileInstanceManager;
 import com.jozufozu.flywheel.backend.material.MaterialManager;

src/main/java/com/jozufozu/flywheel/backend/instancing/tile/TileEntityInstance.java

@@ -1,7 +1,7 @@
 package com.jozufozu.flywheel.backend.instancing.tile;
 
-import com.jozufozu.flywheel.backend.instancing.IDynamicInstance;
 import com.jozufozu.flywheel.backend.instancing.AbstractInstance;
+import com.jozufozu.flywheel.backend.instancing.IDynamicInstance;
 import com.jozufozu.flywheel.backend.instancing.ITickableInstance;
 import com.jozufozu.flywheel.backend.material.Material;
 import com.jozufozu.flywheel.backend.material.MaterialManager;

src/main/java/com/jozufozu/flywheel/backend/material/MaterialRenderer.java

@@ -5,7 +5,6 @@ import java.util.function.Consumer;
 import java.util.function.Supplier;
 
 import com.jozufozu.flywheel.backend.instancing.GPUInstancer;
-import com.jozufozu.flywheel.backend.instancing.Instancer;
 import com.jozufozu.flywheel.core.shader.WorldProgram;
 
 import net.minecraft.util.math.vector.Matrix4f;

src/main/java/com/jozufozu/flywheel/backend/model/BufferedModel.java

@@ -2,15 +2,13 @@ package com.jozufozu.flywheel.backend.model;
 
 import static org.lwjgl.opengl.GL20.glDrawArrays;
 
-import org.lwjgl.opengl.GL44;
-
 import com.jozufozu.flywheel.backend.Backend;
 import com.jozufozu.flywheel.backend.gl.GlPrimitive;
 import com.jozufozu.flywheel.backend.gl.attrib.VertexFormat;
 import com.jozufozu.flywheel.backend.gl.buffer.GlBuffer;
-import com.jozufozu.flywheel.backend.gl.buffer.MappedGlBuffer;
 import com.jozufozu.flywheel.backend.gl.buffer.GlBufferType;
 import com.jozufozu.flywheel.backend.gl.buffer.MappedBuffer;
+import com.jozufozu.flywheel.backend.gl.buffer.MappedGlBuffer;
 import com.jozufozu.flywheel.core.model.IModel;
 import com.jozufozu.flywheel.util.AttribUtil;
 

src/main/java/com/jozufozu/flywheel/backend/model/IndexedModel.java

@@ -1,13 +1,9 @@
 package com.jozufozu.flywheel.backend.model;
 
-import java.nio.ByteBuffer;
-
 import org.lwjgl.opengl.GL20;
 
 import com.jozufozu.flywheel.backend.Backend;
 import com.jozufozu.flywheel.backend.gl.GlPrimitive;
-import com.jozufozu.flywheel.backend.gl.attrib.VertexFormat;
-import com.jozufozu.flywheel.core.QuadConverter;
 import com.jozufozu.flywheel.core.model.IModel;
 
 /**

src/main/java/com/jozufozu/flywheel/backend/pipeline/Shader.java

@@ -1,10 +1,5 @@
 package com.jozufozu.flywheel.backend.pipeline;
 
-import com.jozufozu.flywheel.backend.gl.shader.GlShader;
-import com.jozufozu.flywheel.backend.gl.shader.ShaderType;
-
-import net.minecraft.util.ResourceLocation;
-
 public class Shader {
 
 

src/main/java/com/jozufozu/flywheel/backend/pipeline/WorldShader.java

@@ -3,9 +3,9 @@ package com.jozufozu.flywheel.backend.pipeline;
 import java.util.List;
 import java.util.Optional;
 
-import com.jozufozu.flywheel.backend.source.FileResolution;
 import com.jozufozu.flywheel.backend.gl.shader.GlShader;
 import com.jozufozu.flywheel.backend.gl.shader.ShaderType;
+import com.jozufozu.flywheel.backend.source.FileResolution;
 import com.jozufozu.flywheel.backend.source.SourceFile;
 
 import net.minecraft.util.ResourceLocation;

src/main/java/com/jozufozu/flywheel/backend/pipeline/WorldShaderPipeline.java

@@ -1,13 +1,11 @@
 package com.jozufozu.flywheel.backend.pipeline;
 
-import static org.lwjgl.opengl.GL20.glGetProgramInfoLog;
-
 import java.util.List;
 
 import javax.annotation.Nullable;
 
-import com.jozufozu.flywheel.backend.source.FileResolution;
 import com.jozufozu.flywheel.backend.gl.shader.ShaderType;
+import com.jozufozu.flywheel.backend.source.FileResolution;
 import com.jozufozu.flywheel.backend.source.SourceFile;
 import com.jozufozu.flywheel.core.shader.ExtensibleGlProgram;
 import com.jozufozu.flywheel.core.shader.GameStateProgram;

src/main/java/com/jozufozu/flywheel/backend/source/parse/Import.java

@@ -8,8 +8,8 @@ import javax.annotation.Nullable;
 
 import com.jozufozu.flywheel.backend.source.FileResolution;
 import com.jozufozu.flywheel.backend.source.Resolver;
-import com.jozufozu.flywheel.backend.source.error.ErrorReporter;
 import com.jozufozu.flywheel.backend.source.SourceFile;
+import com.jozufozu.flywheel.backend.source.error.ErrorReporter;
 import com.jozufozu.flywheel.backend.source.span.Span;
 
 import net.minecraft.util.ResourceLocation;

src/main/java/com/jozufozu/flywheel/core/Contexts.java

@@ -2,12 +2,11 @@ package com.jozufozu.flywheel.core;
 
 import com.jozufozu.flywheel.Flywheel;
 import com.jozufozu.flywheel.backend.Backend;
-import com.jozufozu.flywheel.backend.source.FileResolution;
-import com.jozufozu.flywheel.util.ResourceUtil;
 import com.jozufozu.flywheel.backend.SpecMetaRegistry;
 import com.jozufozu.flywheel.backend.pipeline.IShaderPipeline;
 import com.jozufozu.flywheel.backend.pipeline.InstancingTemplate;
 import com.jozufozu.flywheel.backend.pipeline.WorldShaderPipeline;
+import com.jozufozu.flywheel.backend.source.FileResolution;
 import com.jozufozu.flywheel.backend.source.Resolver;
 import com.jozufozu.flywheel.core.crumbling.CrumblingProgram;
 import com.jozufozu.flywheel.core.shader.WorldFog;
@@ -15,6 +14,7 @@ import com.jozufozu.flywheel.core.shader.WorldProgram;
 import com.jozufozu.flywheel.core.shader.gamestate.FogStateProvider;
 import com.jozufozu.flywheel.core.shader.gamestate.NormalDebugStateProvider;
 import com.jozufozu.flywheel.event.GatherContextEvent;
+import com.jozufozu.flywheel.util.ResourceUtil;
 
 import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.api.distmarker.Dist;

src/main/java/com/jozufozu/flywheel/core/FullscreenQuad.java

@@ -5,8 +5,8 @@ import org.lwjgl.opengl.GL20;
 import com.jozufozu.flywheel.backend.gl.GlNumericType;
 import com.jozufozu.flywheel.backend.gl.GlVertexArray;
 import com.jozufozu.flywheel.backend.gl.buffer.GlBuffer;
-import com.jozufozu.flywheel.backend.gl.buffer.MappedGlBuffer;
 import com.jozufozu.flywheel.backend.gl.buffer.GlBufferType;
+import com.jozufozu.flywheel.backend.gl.buffer.MappedGlBuffer;
 
 import net.minecraftforge.common.util.Lazy;
 

src/main/java/com/jozufozu/flywheel/core/QuadConverter.java

@@ -14,8 +14,8 @@ import org.lwjgl.system.MemoryUtil;
 
 import com.jozufozu.flywheel.backend.gl.GlNumericType;
 import com.jozufozu.flywheel.backend.gl.buffer.GlBuffer;
-import com.jozufozu.flywheel.backend.gl.buffer.MappedGlBuffer;
 import com.jozufozu.flywheel.backend.gl.buffer.GlBufferType;
+import com.jozufozu.flywheel.backend.gl.buffer.MappedGlBuffer;
 import com.jozufozu.flywheel.backend.model.ElementBuffer;
 import com.jozufozu.flywheel.event.ReloadRenderersEvent;
 

src/main/java/com/jozufozu/flywheel/core/crumbling/CrumblingRenderer.java

@@ -10,7 +10,6 @@ import java.util.SortedSet;
 import com.jozufozu.flywheel.backend.Backend;
 import com.jozufozu.flywheel.backend.gl.GlTextureUnit;
 import com.jozufozu.flywheel.backend.instancing.InstanceManager;
-import com.jozufozu.flywheel.backend.material.MaterialManager;
 import com.jozufozu.flywheel.backend.material.MaterialManagerImpl;
 import com.jozufozu.flywheel.backend.state.RenderLayer;
 import com.jozufozu.flywheel.core.Contexts;

src/main/java/com/jozufozu/flywheel/core/materials/BasicData.java

@@ -1,7 +1,6 @@
 package com.jozufozu.flywheel.core.materials;
 
 import com.jozufozu.flywheel.backend.gl.buffer.MappedBuffer;
-import com.jozufozu.flywheel.backend.instancing.GPUInstancer;
 import com.jozufozu.flywheel.backend.instancing.InstanceData;
 import com.jozufozu.flywheel.backend.instancing.Instancer;
 

src/main/java/com/jozufozu/flywheel/core/materials/ModelData.java

@@ -1,7 +1,6 @@
 package com.jozufozu.flywheel.core.materials;
 
 import com.jozufozu.flywheel.backend.gl.buffer.MappedBuffer;
-import com.jozufozu.flywheel.backend.instancing.GPUInstancer;
 import com.jozufozu.flywheel.backend.instancing.Instancer;
 import com.jozufozu.flywheel.util.RenderUtil;
 import com.mojang.blaze3d.matrix.MatrixStack;

src/main/java/com/jozufozu/flywheel/core/materials/OrientedData.java

@@ -1,7 +1,6 @@
 package com.jozufozu.flywheel.core.materials;
 
 import com.jozufozu.flywheel.backend.gl.buffer.MappedBuffer;
-import com.jozufozu.flywheel.backend.instancing.GPUInstancer;
 import com.jozufozu.flywheel.backend.instancing.Instancer;
 import com.jozufozu.flywheel.util.vec.Vec3;
 

src/main/java/com/jozufozu/flywheel/core/model/BakedModelModel.java

@@ -15,20 +15,15 @@ import com.jozufozu.flywheel.backend.gl.attrib.VertexFormat;
 import com.jozufozu.flywheel.backend.gl.buffer.VecBuffer;
 import com.jozufozu.flywheel.core.Formats;
 import com.jozufozu.flywheel.util.VirtualEmptyModelData;
-import com.mojang.blaze3d.matrix.MatrixStack;
 
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.renderer.ItemRenderer;
 import net.minecraft.client.renderer.color.ItemColors;
 import net.minecraft.client.renderer.model.BakedQuad;
 import net.minecraft.client.renderer.model.IBakedModel;
-import net.minecraft.client.renderer.model.ItemCameraTransforms;
 import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
-import net.minecraft.item.ItemStack;
 import net.minecraft.util.Direction;
 import net.minecraft.util.math.vector.Vector3f;
 import net.minecraft.util.math.vector.Vector3i;
-import net.minecraftforge.client.ForgeHooksClient;
 
 public class BakedModelModel implements IModel {
 	// DOWN, UP, NORTH, SOUTH, WEST, EAST, null

src/main/java/com/jozufozu/flywheel/core/model/ModelPart.java

@@ -4,9 +4,7 @@ import java.util.List;
 
 import com.jozufozu.flywheel.backend.gl.attrib.VertexFormat;
 import com.jozufozu.flywheel.backend.gl.buffer.VecBuffer;
-import com.jozufozu.flywheel.backend.model.ElementBuffer;
 import com.jozufozu.flywheel.core.Formats;
-import com.jozufozu.flywheel.core.QuadConverter;
 
 public class ModelPart implements IModel {
 

src/main/java/com/jozufozu/flywheel/core/model/ModelUtil.java

@@ -2,7 +2,6 @@ package com.jozufozu.flywheel.core.model;
 
 import static org.lwjgl.opengl.GL11.GL_QUADS;
 
-
 import java.util.Collection;
 import java.util.Random;
 

src/main/java/com/jozufozu/flywheel/event/BeginFrameEvent.java

@@ -1,10 +1,6 @@
 package com.jozufozu.flywheel.event;
 
-import com.mojang.blaze3d.matrix.MatrixStack;
-
 import net.minecraft.client.renderer.ActiveRenderInfo;
-import net.minecraft.client.renderer.GameRenderer;
-import net.minecraft.client.renderer.LightTexture;
 import net.minecraft.client.renderer.culling.ClippingHelper;
 import net.minecraft.client.world.ClientWorld;
 import net.minecraft.util.math.vector.Vector3d;

src/main/java/com/jozufozu/flywheel/light/GPULightVolume.java

@@ -23,7 +23,6 @@ import static org.lwjgl.opengl.GL20.glTexImage3D;
 import static org.lwjgl.opengl.GL20.glTexParameteri;
 import static org.lwjgl.opengl.GL20.glTexSubImage3D;
 
-
 import com.jozufozu.flywheel.backend.Backend;
 import com.jozufozu.flywheel.backend.gl.GlTexture;
 import com.jozufozu.flywheel.backend.gl.GlTextureUnit;