Clean up imports project-wide

robotgryphon · robotgryphon · commit 60726e448ed0 · 2025-02-10T01:23:05.000-05:00
diff --git a/levels/src/main/java/dev/compactmods/gander/level/VirtualLevel.java b/levels/src/main/java/dev/compactmods/gander/level/VirtualLevel.java
@@ -49,7 +49,6 @@
 import net.minecraft.world.level.dimension.DimensionType;
 import net.minecraft.world.level.entity.LevelEntityGetter;
 import net.minecraft.world.level.gameevent.GameEvent;
-import net.minecraft.world.level.levelgen.structure.BoundingBox;
 import net.minecraft.world.level.lighting.LevelLightEngine;
 import net.minecraft.world.level.material.Fluid;
 import net.minecraft.world.level.material.FluidState;
diff --git a/levels/src/main/java/dev/compactmods/gander/level/block/VirtualBlockAndTintGetter.java b/levels/src/main/java/dev/compactmods/gander/level/block/VirtualBlockAndTintGetter.java
@@ -1,6 +1,5 @@
 package dev.compactmods.gander.level.block;
 
-import dev.compactmods.gander.level.light.VirtualLightEngine;
 import net.minecraft.client.Minecraft;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
diff --git a/rendering/src/main/java/dev/compactmods/gander/render/RenderTypes.java b/rendering/src/main/java/dev/compactmods/gander/render/RenderTypes.java
@@ -9,11 +9,9 @@
 import net.neoforged.neoforge.client.event.RenderLevelStageEvent;
 
 import java.util.Map;
-import java.util.Set;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
-// TODO 1.17: use custom shaders instead of vanilla ones
 public class RenderTypes extends RenderStateShard {
 
     public static final Map<RenderLevelStageEvent.Stage, RenderType> GEOMETRY_STAGES
diff --git a/rendering/src/main/java/dev/compactmods/gander/render/geometry/BakedLevelSection.java b/rendering/src/main/java/dev/compactmods/gander/render/geometry/BakedLevelSection.java
@@ -24,7 +24,6 @@ public record BakedLevelSection(SectionBufferBuilderPack blockBuilders,
                                 AABB blockBoundaries) {
 
     public void resortTranslucency(Vector3f cameraPosition) {
-        // FIXME - This is broken somehow, causes a black screen
         var vertexSorting = VertexSorting.byDistance(cameraPosition.x, cameraPosition.y, cameraPosition.z);
         resortTranslucency(vertexSorting, blockBuilders, blockBuffers, blockSortStates);
         resortTranslucency(vertexSorting, fluidBuilders, fluidBuffers, fluidSortStates);
diff --git a/rendering/src/main/java/dev/compactmods/gander/render/mixin/CompositeRenderTypeMixin.java b/rendering/src/main/java/dev/compactmods/gander/render/mixin/CompositeRenderTypeMixin.java
@@ -1,7 +1,5 @@
 package dev.compactmods.gander.render.mixin;
 
-import com.mojang.blaze3d.pipeline.RenderTarget;
-
 import com.mojang.blaze3d.vertex.VertexFormat;
 
 import dev.compactmods.gander.render.rendertypes.GanderCompositeRenderType;
diff --git a/rendering/src/main/java/dev/compactmods/gander/render/mixin/GlStateManagerAccessor.java b/rendering/src/main/java/dev/compactmods/gander/render/mixin/GlStateManagerAccessor.java
@@ -2,13 +2,7 @@
 
 import com.mojang.blaze3d.platform.GlStateManager;
 
-import com.mojang.blaze3d.platform.GlStateManager.TextureState;
-import com.mojang.blaze3d.systems.RenderSystem;
-
-import org.lwjgl.opengl.GL11;
-import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.gen.Accessor;
 
 @Mixin(GlStateManager.class)
diff --git a/rendering/src/main/java/dev/compactmods/gander/render/pipeline/MultiPassRenderPipeline.java b/rendering/src/main/java/dev/compactmods/gander/render/pipeline/MultiPassRenderPipeline.java
@@ -1,16 +1,11 @@
 package dev.compactmods.gander.render.pipeline;
 
-import com.mojang.blaze3d.vertex.PoseStack;
-
-import net.minecraft.client.Camera;
 import net.minecraft.client.gui.GuiGraphics;
 
 import net.minecraft.client.renderer.RenderType;
 
 import net.minecraft.client.renderer.culling.Frustum;
 
-import org.joml.Matrix4f;
-
 public interface MultiPassRenderPipeline extends RenderPipeline {
 
     void renderPass(PipelineState state, RenderType renderType, GuiGraphics graphics, Frustum frustum, float partialTicks);
diff --git a/rendering/src/main/java/dev/compactmods/gander/render/pipeline/PipelineState.java b/rendering/src/main/java/dev/compactmods/gander/render/pipeline/PipelineState.java
@@ -2,9 +2,6 @@
 
 import it.unimi.dsi.fastutil.objects.Reference2ObjectOpenHashMap;
 
-import org.joml.Vector3f;
-import org.joml.Vector3fc;
-
 public class PipelineState {
 
     public record Item<T>(Class<T> type) {}
diff --git a/rendering/src/main/java/dev/compactmods/gander/render/pipeline/SingleEntrypointRenderPipeline.java b/rendering/src/main/java/dev/compactmods/gander/render/pipeline/SingleEntrypointRenderPipeline.java
@@ -1,13 +1,8 @@
 package dev.compactmods.gander.render.pipeline;
 
-import com.mojang.blaze3d.vertex.PoseStack;
-
 import dev.compactmods.gander.render.pipeline.phase.PipelinePhaseCollection;
-import net.minecraft.client.Camera;
 import net.minecraft.client.gui.GuiGraphics;
 
-import org.joml.Matrix4f;
-
 import java.util.function.Consumer;
 
 public record SingleEntrypointRenderPipeline(PipelinePhaseCollection phases)
diff --git a/rendering/src/main/java/dev/compactmods/gander/render/pipeline/StagedMultipassRenderPipeline.java b/rendering/src/main/java/dev/compactmods/gander/render/pipeline/StagedMultipassRenderPipeline.java
@@ -1,15 +1,10 @@
 package dev.compactmods.gander.render.pipeline;
 
-import com.mojang.blaze3d.vertex.PoseStack;
-
 import dev.compactmods.gander.render.pipeline.phase.PipelinePhaseCollection;
-import net.minecraft.client.Camera;
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.renderer.RenderType;
 import net.minecraft.client.renderer.culling.Frustum;
 
-import org.joml.Matrix4f;
-
 import java.util.function.Consumer;
 
 public record StagedMultipassRenderPipeline(PipelinePhaseCollection phaseCollection) implements MultiPassRenderPipeline {
diff --git a/rendering/src/main/java/dev/compactmods/gander/render/pipeline/impl/BakedLevelOverlayPipeline.java b/rendering/src/main/java/dev/compactmods/gander/render/pipeline/impl/BakedLevelOverlayPipeline.java
@@ -2,15 +2,11 @@
 
 import com.mojang.blaze3d.vertex.PoseStack;
 
-import com.mojang.blaze3d.vertex.VertexBuffer;
-
-import dev.compactmods.gander.render.geometry.BakedLevel;
 import dev.compactmods.gander.render.pipeline.MultiPassRenderPipeline;
 import dev.compactmods.gander.render.pipeline.PipelineState;
 import dev.compactmods.gander.render.pipeline.RenderPipelineBuilder;
 import dev.compactmods.gander.render.toolkit.BlockRenderer;
 import dev.compactmods.gander.render.toolkit.GanderRenderToolkit;
-import net.minecraft.client.Camera;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.renderer.MultiBufferSource;
@@ -20,17 +16,13 @@
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.phys.Vec3;
 
-import org.joml.Matrix4f;
 import org.joml.Vector3f;
 
 import java.util.Arrays;
-import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
 import java.util.function.Function;
 import java.util.function.Predicate;
-import java.util.function.Supplier;
-import java.util.stream.Stream;
 
 public final class BakedLevelOverlayPipeline {
 
diff --git a/rendering/src/main/java/dev/compactmods/gander/render/pipeline/phase/PipelineGeometryUploadPhase.java b/rendering/src/main/java/dev/compactmods/gander/render/pipeline/phase/PipelineGeometryUploadPhase.java
@@ -1,13 +1,10 @@
 package dev.compactmods.gander.render.pipeline.phase;
 
 import dev.compactmods.gander.render.pipeline.PipelineState;
-import net.minecraft.client.Camera;
 import net.minecraft.client.gui.GuiGraphics;
 
 import net.minecraft.client.renderer.RenderType;
 
-import org.joml.Matrix4f;
-
 public interface PipelineGeometryUploadPhase extends PipelinePhase {
 
     default boolean shouldRun(RenderType renderType) {
diff --git a/rendering/src/main/java/dev/compactmods/gander/render/pipeline/phase/PredicateWrappedGeometryUploadPhase.java b/rendering/src/main/java/dev/compactmods/gander/render/pipeline/phase/PredicateWrappedGeometryUploadPhase.java
@@ -1,13 +1,10 @@
 package dev.compactmods.gander.render.pipeline.phase;
 
 import dev.compactmods.gander.render.pipeline.PipelineState;
-import net.minecraft.client.Camera;
 import net.minecraft.client.gui.GuiGraphics;
 
 import net.minecraft.client.renderer.RenderType;
 
-import org.joml.Matrix4f;
-
 import java.util.function.Predicate;
 
 public record PredicateWrappedGeometryUploadPhase(Predicate<RenderType> predicate, PipelineGeometryUploadPhase phase) implements PipelineGeometryUploadPhase {
diff --git a/rendering/src/main/java/dev/compactmods/gander/render/screen/GanderScreenPipelinePhases.java b/rendering/src/main/java/dev/compactmods/gander/render/screen/GanderScreenPipelinePhases.java
@@ -6,12 +6,10 @@
 import dev.compactmods.gander.render.toolkit.BlockEntityRender;
 import dev.compactmods.gander.render.toolkit.BlockRenderer;
 import dev.compactmods.gander.render.toolkit.GanderRenderToolkit;
-import net.minecraft.client.Camera;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.renderer.RenderType;
 
-import org.joml.Matrix4f;
 import org.joml.Vector3f;
 
 import java.util.Arrays;
diff --git a/rendering/src/main/java/dev/compactmods/gander/render/toolkit/BlockRenderer.java b/rendering/src/main/java/dev/compactmods/gander/render/toolkit/BlockRenderer.java
@@ -6,10 +6,8 @@
 
 import com.mojang.blaze3d.vertex.VertexBuffer;
 
-import dev.compactmods.gander.render.geometry.BakedLevel;
 import dev.compactmods.gander.render.geometry.BakedLevelSection;
 import dev.compactmods.gander.render.rendertypes.RenderTypeStore;
-import net.minecraft.client.Camera;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.RenderType;
 import net.minecraft.client.renderer.ShaderInstance;
diff --git a/rendering/src/main/java/dev/compactmods/gander/render/toolkit/GanderRenderToolkit.java b/rendering/src/main/java/dev/compactmods/gander/render/toolkit/GanderRenderToolkit.java
@@ -3,7 +3,6 @@
 import com.mojang.blaze3d.pipeline.RenderTarget;
 import com.mojang.blaze3d.vertex.VertexSorting;
 
-import dev.compactmods.gander.render.RenderBoundaries;
 import dev.compactmods.gander.render.geometry.BakedLevel;
 import dev.compactmods.gander.render.pipeline.PipelineState;
 import dev.compactmods.gander.render.rendertypes.RenderTypeStore;
@@ -14,13 +13,9 @@
 import net.minecraft.client.gui.navigation.ScreenRectangle;
 import net.minecraft.core.BlockPos;
 
-import net.minecraft.world.level.block.entity.BlockEntity;
-
 import org.joml.Matrix4f;
 import org.joml.Vector3fc;
 
-import java.util.stream.Stream;
-
 public class GanderRenderToolkit {
     public static final PipelineState.Item<GraphicsStatus> PREVIOUS_GRAPHICS_MODE = new PipelineState.Item<>(GraphicsStatus.class);
     public static final PipelineState.Item<Matrix4f> ORIGINAL_MATRIX = new PipelineState.Item<>(Matrix4f.class);
diff --git a/rendering/src/main/java/dev/compactmods/gander/render/translucency/TranslucencyChainBuilder.java b/rendering/src/main/java/dev/compactmods/gander/render/translucency/TranslucencyChainBuilder.java
@@ -1,9 +1,7 @@
 package dev.compactmods.gander.render.translucency;
 
-import com.google.common.collect.Lists;
 import com.mojang.blaze3d.pipeline.RenderTarget;
 
-import net.minecraft.client.renderer.PostChain;
 import net.minecraft.resources.ResourceLocation;
 
 import java.util.ArrayList;
diff --git a/testmod/src/main/java/dev/compactmods/gander/client/gui/ScreenOpener.java b/testmod/src/main/java/dev/compactmods/gander/client/gui/ScreenOpener.java
@@ -4,7 +4,6 @@
 import java.util.function.Supplier;
 
 import net.minecraft.world.phys.AABB;
-import net.minecraft.world.phys.Vec3;
 
 import org.apache.commons.lang3.function.Consumers;
 import org.joml.Vector3f;
diff --git a/testmod/src/main/java/dev/compactmods/gander/command/GanderCommandHelper.java b/testmod/src/main/java/dev/compactmods/gander/command/GanderCommandHelper.java
@@ -11,7 +11,6 @@
 import net.minecraft.core.SectionPos;
 import net.minecraft.core.Vec3i;
 import net.minecraft.core.registries.Registries;
-import net.minecraft.server.MinecraftServer;
 import net.minecraft.world.level.ChunkPos;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.StructureManager;
diff --git a/testmod/src/main/java/dev/compactmods/gander/network/OpenGanderUiForDeferredStructureRequest.java b/testmod/src/main/java/dev/compactmods/gander/network/OpenGanderUiForDeferredStructureRequest.java
@@ -3,15 +3,13 @@
 import dev.compactmods.gander.GanderTestMod;
 import dev.compactmods.gander.client.gui.ScreenOpener;
 import net.minecraft.network.RegistryFriendlyByteBuf;
-import net.minecraft.network.codec.ByteBufCodecs;
 import net.minecraft.network.codec.StreamCodec;
 import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
 import net.minecraft.resources.ResourceLocation;
 import net.neoforged.fml.loading.FMLEnvironment;
 import net.neoforged.neoforge.network.handling.IPayloadHandler;
 
 import org.jetbrains.annotations.NotNull;
-import org.joml.Vector3f;
 
 public record OpenGanderUiForDeferredStructureRequest(ResourceLocation structureId) implements CustomPacketPayload {
 
diff --git a/testmod/src/main/java/dev/compactmods/gander/network/RenderInWorldForDeferredStructureRequest.java b/testmod/src/main/java/dev/compactmods/gander/network/RenderInWorldForDeferredStructureRequest.java
@@ -1,7 +1,6 @@
 package dev.compactmods.gander.network;
 
 import dev.compactmods.gander.GanderTestMod;
-import dev.compactmods.gander.world.LevelOverlayRenderSystem;
 import net.minecraft.network.RegistryFriendlyByteBuf;
 import net.minecraft.network.codec.ByteBufCodecs;
 import net.minecraft.network.codec.StreamCodec;
diff --git a/ui/src/main/java/dev/compactmods/gander/ui/widget/CompassOverlay.java b/ui/src/main/java/dev/compactmods/gander/ui/widget/CompassOverlay.java
@@ -4,7 +4,6 @@
 import com.mojang.blaze3d.vertex.BufferUploader;
 import com.mojang.blaze3d.vertex.DefaultVertexFormat;
 import com.mojang.blaze3d.vertex.PoseStack;
-import com.mojang.blaze3d.vertex.VertexFormat;
 import com.mojang.blaze3d.vertex.VertexFormat.Mode;
 import com.mojang.math.Axis;
 
@@ -13,14 +12,11 @@
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.components.Renderable;
 import net.minecraft.client.renderer.GameRenderer;
-import net.minecraft.client.renderer.RenderType;
 import net.minecraft.core.Direction;
-import net.minecraft.util.Mth;
 import net.minecraft.world.item.DyeColor;
 import net.minecraft.world.level.levelgen.structure.BoundingBox;
 
 import org.jetbrains.annotations.Nullable;
-import org.joml.Matrix4f;
 
 public class CompassOverlay implements Renderable {
 
diff --git a/ui/src/main/java/dev/compactmods/gander/ui/widget/SpatialRenderer.java b/ui/src/main/java/dev/compactmods/gander/ui/widget/SpatialRenderer.java
@@ -9,7 +9,6 @@
 
 import com.mojang.blaze3d.vertex.PoseStack;
 
-import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.components.Renderable;
 import net.minecraft.client.gui.GuiGraphics;
 
@@ -19,7 +18,6 @@
 import net.minecraft.core.BlockPos;
 
 import org.jetbrains.annotations.NotNull;
-import org.joml.Matrix4f;
 
 public class SpatialRenderer implements Renderable {
     private final GanderScreenRenderHelper renderHelper;
@@ -46,8 +44,8 @@ public SceneCamera camera() {
     }
 
     public void recalculateTranslucency() {
-        // FIXME - Black Screen Issue
-        //  renderingContext.recalculateTranslucency(camera);
+        final var lvl = state.get(GanderRenderToolkit.BAKED_LEVEL);
+        lvl.resortTranslucency(camera.getLookFrom());
     }
 
     public void shouldRenderCompass(boolean render) {
