From b892f602cb7f80a9f373bc89210c1dc294ec80d7 Mon Sep 17 00:00:00 2001 From: Jozufozu Date: Thu, 9 Dec 2021 16:40:01 -0800 Subject: [PATCH] Whoops remove imports --- src/main/java/com/jozufozu/flywheel/api/MaterialGroup.java | 2 +- src/main/java/com/jozufozu/flywheel/backend/Backend.java | 1 - .../flywheel/backend/instancing/batching/BatchedMaterial.java | 1 - .../backend/instancing/batching/BatchedMaterialGroup.java | 3 +-- .../backend/instancing/instancing/InstancedMaterial.java | 1 - .../backend/instancing/instancing/InstancedMaterialGroup.java | 1 - 6 files changed, 2 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/jozufozu/flywheel/api/MaterialGroup.java b/src/main/java/com/jozufozu/flywheel/api/MaterialGroup.java index ba48748df..47908b64e 100644 --- a/src/main/java/com/jozufozu/flywheel/api/MaterialGroup.java +++ b/src/main/java/com/jozufozu/flywheel/api/MaterialGroup.java @@ -4,7 +4,7 @@ import com.jozufozu.flywheel.api.struct.StructType; public interface MaterialGroup { /** - * Get the material as defined by the given {@link MaterialSpec spec}. + * Get the material as defined by the given {@link StructType type}. * * @param spec The material you want to create instances with. * @param The type representing the per instance data. diff --git a/src/main/java/com/jozufozu/flywheel/backend/Backend.java b/src/main/java/com/jozufozu/flywheel/backend/Backend.java index 6485843e3..2be21c97e 100644 --- a/src/main/java/com/jozufozu/flywheel/backend/Backend.java +++ b/src/main/java/com/jozufozu/flywheel/backend/Backend.java @@ -16,7 +16,6 @@ import org.lwjgl.opengl.GLCapabilities; import com.jozufozu.flywheel.api.FlywheelWorld; import com.jozufozu.flywheel.backend.gl.versioned.GlCompat; import com.jozufozu.flywheel.api.InstanceData; -import com.jozufozu.flywheel.api.MaterialSpec; import com.jozufozu.flywheel.api.struct.StructType; import com.jozufozu.flywheel.config.FlwConfig; import com.jozufozu.flywheel.core.shader.spec.ProgramSpec; diff --git a/src/main/java/com/jozufozu/flywheel/backend/instancing/batching/BatchedMaterial.java b/src/main/java/com/jozufozu/flywheel/backend/instancing/batching/BatchedMaterial.java index c9e022800..2593c67bf 100644 --- a/src/main/java/com/jozufozu/flywheel/backend/instancing/batching/BatchedMaterial.java +++ b/src/main/java/com/jozufozu/flywheel/backend/instancing/batching/BatchedMaterial.java @@ -7,7 +7,6 @@ import java.util.function.Supplier; import com.jozufozu.flywheel.api.InstanceData; import com.jozufozu.flywheel.api.Instancer; import com.jozufozu.flywheel.api.Material; -import com.jozufozu.flywheel.api.MaterialSpec; import com.jozufozu.flywheel.api.struct.StructType; import com.jozufozu.flywheel.core.model.Model; import com.mojang.blaze3d.vertex.PoseStack; diff --git a/src/main/java/com/jozufozu/flywheel/backend/instancing/batching/BatchedMaterialGroup.java b/src/main/java/com/jozufozu/flywheel/backend/instancing/batching/BatchedMaterialGroup.java index dc35e0f06..70e092e75 100644 --- a/src/main/java/com/jozufozu/flywheel/backend/instancing/batching/BatchedMaterialGroup.java +++ b/src/main/java/com/jozufozu/flywheel/backend/instancing/batching/BatchedMaterialGroup.java @@ -5,7 +5,6 @@ import java.util.Map; import com.jozufozu.flywheel.api.InstanceData; import com.jozufozu.flywheel.api.MaterialGroup; -import com.jozufozu.flywheel.api.MaterialSpec; import com.jozufozu.flywheel.api.struct.StructType; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; @@ -24,7 +23,7 @@ public class BatchedMaterialGroup implements MaterialGroup { } /** - * Get the material as defined by the given {@link MaterialSpec spec}. + * Get the material as defined by the given {@link StructType type}. * @param spec The material you want to create instances with. * @param The type representing the per instance data. * @return A diff --git a/src/main/java/com/jozufozu/flywheel/backend/instancing/instancing/InstancedMaterial.java b/src/main/java/com/jozufozu/flywheel/backend/instancing/instancing/InstancedMaterial.java index 675b8fd90..dc8678362 100644 --- a/src/main/java/com/jozufozu/flywheel/backend/instancing/instancing/InstancedMaterial.java +++ b/src/main/java/com/jozufozu/flywheel/backend/instancing/instancing/InstancedMaterial.java @@ -9,7 +9,6 @@ import com.jozufozu.flywheel.backend.RenderWork; import com.jozufozu.flywheel.api.InstanceData; import com.jozufozu.flywheel.api.Instancer; import com.jozufozu.flywheel.api.Material; -import com.jozufozu.flywheel.api.MaterialSpec; import com.jozufozu.flywheel.backend.model.ModelPool; import com.jozufozu.flywheel.api.struct.StructType; import com.jozufozu.flywheel.core.Formats; diff --git a/src/main/java/com/jozufozu/flywheel/backend/instancing/instancing/InstancedMaterialGroup.java b/src/main/java/com/jozufozu/flywheel/backend/instancing/instancing/InstancedMaterialGroup.java index cff2ed787..ac7f9b36f 100644 --- a/src/main/java/com/jozufozu/flywheel/backend/instancing/instancing/InstancedMaterialGroup.java +++ b/src/main/java/com/jozufozu/flywheel/backend/instancing/instancing/InstancedMaterialGroup.java @@ -6,7 +6,6 @@ import java.util.Map; import com.jozufozu.flywheel.api.InstanceData; import com.jozufozu.flywheel.api.MaterialGroup; -import com.jozufozu.flywheel.api.MaterialSpec; import com.jozufozu.flywheel.api.struct.StructType; import com.jozufozu.flywheel.core.shader.WorldProgram; import com.jozufozu.flywheel.util.TextureBinder;