diff --git a/src/main/java/com/simibubi/create/foundation/utility/render/FastKineticRenderer.java b/src/main/java/com/simibubi/create/foundation/utility/render/FastKineticRenderer.java index 5ea1f5203..ebe501896 100644 --- a/src/main/java/com/simibubi/create/foundation/utility/render/FastKineticRenderer.java +++ b/src/main/java/com/simibubi/create/foundation/utility/render/FastKineticRenderer.java @@ -17,8 +17,7 @@ import net.minecraft.client.renderer.model.IBakedModel; import net.minecraft.client.renderer.texture.Texture; import net.minecraft.inventory.container.PlayerContainer; import net.minecraft.util.Direction; -import net.minecraft.util.math.vector.Matrix4f; -import net.minecraft.util.math.vector.Vector3d; +import net.minecraft.util.math.Vec3d; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.client.event.RenderWorldLastEvent; import net.minecraftforge.fml.common.Mod; @@ -28,7 +27,6 @@ import org.lwjgl.opengl.GL40; import java.util.*; import java.util.concurrent.ConcurrentLinkedQueue; -import java.util.concurrent.ConcurrentMap; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; import java.util.function.Supplier; @@ -101,7 +99,7 @@ public class FastKineticRenderer { GlStateManager.uniformMatrix4(projection, false, ShaderHelper.MATRIX_BUFFER); // view matrix - Vector3d pos = gameRenderer.getActiveRenderInfo().getProjectedView(); + Vec3d pos = gameRenderer.getActiveRenderInfo().getProjectedView(); Matrix4f translate = Matrix4f.translate((float) -pos.x, (float) -pos.y, (float) -pos.z); translate.multiplyBackward(event.getMatrixStack().peek().getModel()); diff --git a/src/main/java/com/simibubi/create/foundation/utility/render/RotatingBuffer.java b/src/main/java/com/simibubi/create/foundation/utility/render/RotatingBuffer.java index ba69f508d..e154baf8e 100644 --- a/src/main/java/com/simibubi/create/foundation/utility/render/RotatingBuffer.java +++ b/src/main/java/com/simibubi/create/foundation/utility/render/RotatingBuffer.java @@ -1,14 +1,12 @@ package com.simibubi.create.foundation.utility.render; import com.mojang.blaze3d.platform.GlStateManager; -import com.simibubi.create.foundation.block.render.SpriteShiftEntry; import net.minecraft.client.renderer.BufferBuilder; import net.minecraft.client.renderer.GLAllocation; import net.minecraft.client.renderer.LightTexture; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.renderer.Vector3f; import net.minecraft.client.renderer.vertex.VertexFormatElement; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.vector.Vector3f; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL15; import org.lwjgl.opengl.GL20; @@ -16,7 +14,6 @@ import org.lwjgl.opengl.GL40; import java.nio.Buffer; import java.nio.ByteBuffer; -import java.util.function.Consumer; public class RotatingBuffer extends InstancedBuffer { public RotatingBuffer(BufferBuilder buf) { diff --git a/src/main/java/com/simibubi/create/foundation/utility/render/SuperByteBufferCache.java b/src/main/java/com/simibubi/create/foundation/utility/render/SuperByteBufferCache.java index db86d16fa..296fbf3de 100644 --- a/src/main/java/com/simibubi/create/foundation/utility/render/SuperByteBufferCache.java +++ b/src/main/java/com/simibubi/create/foundation/utility/render/SuperByteBufferCache.java @@ -5,11 +5,8 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; import java.util.function.Supplier; -import com.google.common.collect.Collections2; import com.simibubi.create.CreateClient; import com.simibubi.create.foundation.utility.VirtualEmptyModelData; -import net.minecraftforge.client.event.EntityViewRenderEvent; -import net.minecraftforge.client.event.RenderWorldLastEvent; import org.apache.commons.lang3.tuple.Pair; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/com/simibubi/create/foundation/utility/render/TemplateBuffer.java b/src/main/java/com/simibubi/create/foundation/utility/render/TemplateBuffer.java index 222e24df0..109b1f94c 100644 --- a/src/main/java/com/simibubi/create/foundation/utility/render/TemplateBuffer.java +++ b/src/main/java/com/simibubi/create/foundation/utility/render/TemplateBuffer.java @@ -1,23 +1,12 @@ package com.simibubi.create.foundation.utility.render; -import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.datafixers.util.Pair; -import com.simibubi.create.foundation.block.render.SpriteShiftEntry; -import it.unimi.dsi.fastutil.longs.Long2DoubleMap; -import it.unimi.dsi.fastutil.longs.Long2DoubleOpenHashMap; import net.minecraft.client.renderer.BufferBuilder; import net.minecraft.client.renderer.GLAllocation; -import net.minecraft.util.Direction; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.vector.Matrix4f; -import net.minecraft.util.math.vector.Vector4f; -import net.minecraft.world.LightType; -import net.minecraft.world.World; import java.nio.Buffer; import java.nio.ByteBuffer; import java.nio.ByteOrder; -import java.time.temporal.TemporalAccessor; public class TemplateBuffer { protected ByteBuffer template; diff --git a/src/main/java/com/simibubi/create/foundation/utility/render/shader/ShaderHelper.java b/src/main/java/com/simibubi/create/foundation/utility/render/shader/ShaderHelper.java index 2a58b7a2e..9bd8df36d 100644 --- a/src/main/java/com/simibubi/create/foundation/utility/render/shader/ShaderHelper.java +++ b/src/main/java/com/simibubi/create/foundation/utility/render/shader/ShaderHelper.java @@ -2,11 +2,8 @@ package com.simibubi.create.foundation.utility.render.shader; import com.mojang.blaze3d.platform.GlStateManager; import com.simibubi.create.Create; -import com.simibubi.create.CreateClient; import com.simibubi.create.foundation.utility.AnimationTickHolder; -import net.minecraft.client.MainWindow; import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.ActiveRenderInfo; import net.minecraft.client.shader.IShaderManager; import net.minecraft.client.shader.ShaderLinkHelper; import net.minecraft.client.shader.ShaderLoader; @@ -14,8 +11,6 @@ import net.minecraft.resources.IReloadableResourceManager; import net.minecraft.resources.IResourceManager; import net.minecraft.resources.IResourceManagerReloadListener; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.client.event.EntityViewRenderEvent; -import net.minecraftforge.eventbus.api.SubscribeEvent; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.lwjgl.system.MemoryUtil; @@ -26,7 +21,6 @@ import java.io.IOException; import java.io.InputStream; import java.nio.FloatBuffer; import java.util.EnumMap; -import java.util.Locale; import java.util.Map; public class ShaderHelper { @@ -102,7 +96,7 @@ public class ShaderHelper { private static ShaderLoader createShader(IResourceManager manager, String filename, ShaderLoader.ShaderType shaderType) throws IOException { ResourceLocation loc = new ResourceLocation(Create.ID, filename); try (InputStream is = new BufferedInputStream(manager.getResource(loc).getInputStream())) { - return ShaderLoader.func_216534_a(shaderType, loc.toString(), is, shaderType.name().toLowerCase(Locale.ROOT)); + return ShaderLoader.func_216534_a(shaderType, loc.toString(), is); // , shaderType.name().toLowerCase(Locale.ROOT)); } }