fix & format

Author: MCTian-mi

src/main/java/gregtech/client/renderer/scene/VBOWorldSceneRenderer.java

@@ -5,22 +5,23 @@
 import net.minecraft.client.renderer.texture.TextureMap;
 import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
 import net.minecraft.client.renderer.vertex.VertexBuffer;
+import net.minecraft.client.renderer.vertex.VertexFormatElement;
 import net.minecraft.util.BlockRenderLayer;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 import net.minecraftforge.client.ForgeHooksClient;
 import net.minecraftforge.client.MinecraftForgeClient;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
+
 import org.lwjgl.opengl.GL11;
 
-import java.nio.ByteBuffer;
 import java.util.Collection;
 
 @SideOnly(Side.CLIENT)
 public class VBOWorldSceneRenderer extends ImmediateWorldSceneRenderer {
 
-    protected final VertexBuffer[] vbos = new VertexBuffer[BlockRenderLayer.values().length];
+    protected static final VertexBuffer[] VBOS = new VertexBuffer[BlockRenderLayer.values().length];
     protected boolean isDirty = true;
 
     public VBOWorldSceneRenderer(World world) {
@@ -33,17 +34,17 @@ private void uploadVBO() {
         try { // render block in each layer
             for (BlockRenderLayer layer : BlockRenderLayer.values()) {
 
-                var vbo = this.vbos[layer.ordinal()] = new VertexBuffer(DefaultVertexFormats.BLOCK);
-
                 renderBlockLayer(layer);
 
                 // Get the buffer again
                 BufferBuilder buffer = Tessellator.getInstance().getBuffer();
                 buffer.finishDrawing();
                 buffer.reset();
 
-                ByteBuffer data = buffer.getByteBuffer();
-                vbo.bufferData(data);
+                int i = layer.ordinal();
+                var vbo = VBOS[i];
+                if (vbo == null) vbo = VBOS[i] = new VertexBuffer(DefaultVertexFormats.BLOCK);
+                vbo.bufferData(buffer.getByteBuffer());
             }
         } finally {
             ForgeHooksClient.setRenderLayer(oldRenderLayer);
@@ -80,19 +81,20 @@ protected void drawWorld() {
 
             GlStateManager.pushMatrix();
             {
-                var vbo = this.vbos[layer.ordinal()];
+                int i = layer.ordinal();
+                var vbo = VBOS[i];
                 vbo.bindBuffer();
-                setupClientStates();
+                enableClientStates();
                 setupArrayPointers();
                 vbo.drawArrays(GL11.GL_QUADS);
-                resetClientStates();
+                disableClientStates();
                 vbo.unbindBuffer();
             }
             GlStateManager.popMatrix();
         }
         ForgeHooksClient.setRenderLayer(oldRenderLayer);
 
-        renderTESR(); // Handles TileEntities
+        renderTileEntities(); // Handle TileEntities
 
         GlStateManager.shadeModel(GL11.GL_SMOOTH);
         RenderHelper.enableStandardItemLighting();
@@ -111,7 +113,7 @@ public WorldSceneRenderer addRenderedBlocks(Collection<BlockPos> blocks) {
         return super.addRenderedBlocks(blocks);
     }
 
-    protected void setupClientStates() {
+    protected void enableClientStates() {
         GlStateManager.glEnableClientState(GL11.GL_VERTEX_ARRAY);
         OpenGlHelper.setClientActiveTexture(OpenGlHelper.defaultTexUnit);
         GlStateManager.glEnableClientState(GL11.GL_TEXTURE_COORD_ARRAY);
@@ -121,11 +123,19 @@ protected void setupClientStates() {
         GlStateManager.glEnableClientState(GL11.GL_COLOR_ARRAY);
     }
 
-    protected void resetClientStates() {
-        GlStateManager.glDisableClientState(GL11.GL_VERTEX_ARRAY);
-        GlStateManager.glDisableClientState(GL11.GL_TEXTURE_COORD_ARRAY);
-        GlStateManager.glDisableClientState(GL11.GL_TEXTURE_COORD_ARRAY);
-        GlStateManager.glDisableClientState(GL11.GL_COLOR_ARRAY);
+    protected void disableClientStates() {
+        for (VertexFormatElement element : DefaultVertexFormats.BLOCK.getElements()) {
+            switch (element.getUsage()) {
+                case POSITION -> GlStateManager.glDisableClientState(GL11.GL_VERTEX_ARRAY);
+                case COLOR -> GlStateManager.glDisableClientState(GL11.GL_COLOR_ARRAY);
+                case UV -> {
+                    OpenGlHelper.setClientActiveTexture(OpenGlHelper.defaultTexUnit + element.getIndex());
+                    GlStateManager.glDisableClientState(GL11.GL_TEXTURE_COORD_ARRAY);
+                    OpenGlHelper.setClientActiveTexture(OpenGlHelper.defaultTexUnit);
+                }
+                default -> {}
+            }
+        }
     }
 
     protected void setupArrayPointers() {

src/main/java/gregtech/client/renderer/scene/WorldSceneRenderer.java

@@ -1,11 +1,10 @@
 package gregtech.client.renderer.scene;
 
-import codechicken.lib.vec.Vector3;
 import gregtech.api.util.Position;
 import gregtech.api.util.PositionedRect;
 import gregtech.api.util.Size;
 import gregtech.client.utils.RenderUtil;
-import it.unimi.dsi.fastutil.objects.ObjectOpenHashSet;
+
 import net.minecraft.block.Block;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.client.Minecraft;
@@ -24,18 +23,22 @@
 import net.minecraftforge.client.MinecraftForgeClient;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
+
+import codechicken.lib.vec.Vector3;
+import it.unimi.dsi.fastutil.objects.ObjectOpenHashSet;
 import org.jetbrains.annotations.Nullable;
 import org.lwjgl.opengl.GL11;
 import org.lwjgl.util.glu.GLU;
 
-import javax.vecmath.Vector3f;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 import java.nio.FloatBuffer;
 import java.nio.IntBuffer;
 import java.util.Collection;
 import java.util.function.Consumer;
 
+import javax.vecmath.Vector3f;
+
 /**
  * Created with IntelliJ IDEA.
  *
@@ -244,7 +247,7 @@ protected void drawWorld() {
             ForgeHooksClient.setRenderLayer(oldRenderLayer);
         }
 
-        renderTESR(); // Handles TileEntities
+        renderTileEntities(); // Handle TileEntities
 
         GlStateManager.enableDepth();
         GlStateManager.disableBlend();
@@ -275,7 +278,7 @@ protected void renderBlockLayer(BlockRenderLayer layer) {
         }
     }
 
-    protected void renderTESR() {
+    protected void renderTileEntities() {
         RenderHelper.enableStandardItemLighting();
         for (int pass = 0; pass < 2; pass++) {
             ForgeHooksClient.setRenderPass(pass);