- Code / Import refactor.

Author: KasumiNova

src/main/java/com/cleanroommc/client/preview/renderer/scene/FBOWorldSceneRenderer.java

@@ -30,8 +30,8 @@
  */
 @SideOnly(Side.CLIENT)
 public class FBOWorldSceneRenderer extends WorldSceneRenderer {
-    private int resolutionWidth = 1080;
-    private int resolutionHeight = 1080;
+    private int         resolutionWidth  = 1080;
+    private int         resolutionHeight = 1080;
     private Framebuffer fbo;
 
     public FBOWorldSceneRenderer(LRDummyWorld world, int resolutionWidth, int resolutionHeight) {
@@ -73,7 +73,7 @@ public RayTraceResult screenPos2BlockPosFace(int mouseX, int mouseY) {
         return looking;
     }
 
-    public Vector3f blockPos2ScreenPos(BlockPos pos, boolean depth){
+    public Vector3f blockPos2ScreenPos(BlockPos pos, boolean depth) {
         int lastID = bindFBO();
         Vector3f winPos = super.blockPos2ScreenPos(pos, depth, 0, 0, this.resolutionWidth, this.resolutionHeight);
         unbindFBO(lastID);
@@ -92,7 +92,7 @@ public void render(float x, float y, float width, float height, float mouseX, fl
         GlStateManager.disableLighting();
         lastID = GL11.glGetInteger(GL11.GL_TEXTURE_2D);
         GlStateManager.bindTexture(fbo.framebufferTexture);
-        GlStateManager.color(1,1,1,1);
+        GlStateManager.color(1, 1, 1, 1);
 
         // render rect with FBO texture
         Tessellator tessellator = Tessellator.getInstance();
@@ -112,7 +112,7 @@ public void render(float x, float y, float width, float height, int mouseX, int
         render(x, y, width, height, (float) mouseX, (float) mouseY, traceBlock);
     }
 
-    private int bindFBO(){
+    private int bindFBO() {
         int lastID = GL11.glGetInteger(EXTFramebufferObject.GL_FRAMEBUFFER_BINDING_EXT);
         fbo.setFramebufferColor(0.0F, 0.0F, 0.0F, 0.0F);
         fbo.framebufferClear();
@@ -121,7 +121,7 @@ private int bindFBO(){
         return lastID;
     }
 
-    private void unbindFBO(int lastID){
+    private void unbindFBO(int lastID) {
         GlStateManager.popMatrix();
         fbo.unbindFramebufferTexture();
         OpenGlHelper.glBindFramebuffer(OpenGlHelper.GL_FRAMEBUFFER, lastID);

src/main/java/com/cleanroommc/client/preview/renderer/scene/ImmediateWorldSceneRenderer.java

@@ -5,13 +5,13 @@
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.ScaledResolution;
 import net.minecraft.client.renderer.GlStateManager;
-import net.minecraft.world.World;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 import org.lwjgl.opengl.GL11;
 
 /**
  * Created with IntelliJ IDEA.
+ *
  * @Author: KilaBash
  * @Date: 2021/8/24
  * @Description: Real-time rendering renderer.

src/main/java/com/cleanroommc/client/preview/renderer/scene/WorldSceneRenderer.java

@@ -1,6 +1,13 @@
 package com.cleanroommc.client.preview.renderer.scene;
 
-import com.cleanroommc.client.util.*;
+import com.cleanroommc.client.util.EntityCamera;
+import com.cleanroommc.client.util.LRMap;
+import com.cleanroommc.client.util.LRVertexBuffer;
+import com.cleanroommc.client.util.Position;
+import com.cleanroommc.client.util.PositionedRect;
+import com.cleanroommc.client.util.Size;
+import com.cleanroommc.client.util.TrackedDummyWorld;
+import com.cleanroommc.client.util.Vector3;
 import com.cleanroommc.client.util.world.LRDummyWorld;
 import github.kasuminova.mmce.client.util.BufferBuilderPool;
 import hellfirepvp.modularmachinery.common.tiles.base.TileMultiblockMachineController;
@@ -9,7 +16,12 @@
 import net.minecraft.block.Block;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.renderer.*;
+import net.minecraft.client.renderer.BlockRendererDispatcher;
+import net.minecraft.client.renderer.BufferBuilder;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.OpenGlHelper;
+import net.minecraft.client.renderer.RenderHelper;
+import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.client.renderer.texture.TextureMap;
 import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher;
 import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
@@ -34,7 +46,11 @@
 import java.nio.ByteOrder;
 import java.nio.FloatBuffer;
 import java.nio.IntBuffer;
-import java.util.*;
+import java.util.Collection;
+import java.util.EnumMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -52,18 +68,16 @@
 @SuppressWarnings("ALL")
 @SideOnly(Side.CLIENT)
 public abstract class WorldSceneRenderer {
-    protected static final FloatBuffer MODELVIEW_MATRIX_BUFFER = ByteBuffer.allocateDirect(16 * 4).order(ByteOrder.nativeOrder()).asFloatBuffer();
+    protected static final FloatBuffer MODELVIEW_MATRIX_BUFFER  = ByteBuffer.allocateDirect(16 * 4).order(ByteOrder.nativeOrder()).asFloatBuffer();
     protected static final FloatBuffer PROJECTION_MATRIX_BUFFER = ByteBuffer.allocateDirect(16 * 4).order(ByteOrder.nativeOrder()).asFloatBuffer();
-    protected static final IntBuffer VIEWPORT_BUFFER = ByteBuffer.allocateDirect(16 * 4).order(ByteOrder.nativeOrder()).asIntBuffer();
-    protected static final FloatBuffer PIXEL_DEPTH_BUFFER = ByteBuffer.allocateDirect(4).order(ByteOrder.nativeOrder()).asFloatBuffer();
-    protected static final FloatBuffer OBJECT_POS_BUFFER = ByteBuffer.allocateDirect(3 * 4).order(ByteOrder.nativeOrder()).asFloatBuffer();
+    protected static final IntBuffer   VIEWPORT_BUFFER          = ByteBuffer.allocateDirect(16 * 4).order(ByteOrder.nativeOrder()).asIntBuffer();
+    protected static final FloatBuffer PIXEL_DEPTH_BUFFER       = ByteBuffer.allocateDirect(4).order(ByteOrder.nativeOrder()).asFloatBuffer();
+    protected static final FloatBuffer OBJECT_POS_BUFFER        = ByteBuffer.allocateDirect(3 * 4).order(ByteOrder.nativeOrder()).asFloatBuffer();
 
     protected static final AtomicInteger THREAD_ID = new AtomicInteger(0);
 
     protected static final Object2IntMap<BlockRenderLayer> LAYER_PROGRESS_UNITS = new Object2IntOpenHashMap<>();
-    protected static final int TOTAL_PROGRESS_UNIT;
-
-    protected volatile Map<BlockRenderLayer, BufferBuilder> layerBufferBuilders = new EnumMap<>(BlockRenderLayer.class);
+    protected static final int                             TOTAL_PROGRESS_UNIT;
 
     static {
         int totalProgressUnit = 0;
@@ -82,40 +96,56 @@ public abstract class WorldSceneRenderer {
         TOTAL_PROGRESS_UNIT = totalProgressUnit;
     }
 
-    enum CacheState {
-        UNUSED,
-        NEED,
-        COMPILING,
-        COMPILED
-    }
-
-    private final LRDummyWorld dummyWorld;
-    private final LRMap<Collection<BlockPos>, ISceneRenderHook> renderedBlocksMap;
-    private final LRVertexBuffer vertexBuffers = new LRVertexBuffer();
-
-    protected Set<BlockPos> tileEntities = new HashSet<>();
-    protected boolean useCache;
-    protected AtomicReference<CacheState> cacheState;
-    protected int maxProgress;
-    protected final AtomicInteger progress = new AtomicInteger();
-    protected Thread thread;
-    protected EntityCamera viewEntity;
-
-    private Consumer<WorldSceneRenderer> beforeRender;
-    private Consumer<WorldSceneRenderer> afterRender;
-    private Consumer<RayTraceResult> onLookingAt;
-    protected int clearColor;
-    private RayTraceResult lastTraceResult;
-    private Vector3f eyePos = new Vector3f(0, 0, 10f);
-    private Vector3f lookAt = new Vector3f(0, 0, 0);
-    private Vector3f worldUp = new Vector3f(0, 1, 0);
+    protected final    AtomicInteger                                 progress            = new AtomicInteger();
+    private final      LRDummyWorld                                  dummyWorld;
+    private final      LRMap<Collection<BlockPos>, ISceneRenderHook> renderedBlocksMap;
+    private final      LRVertexBuffer                                vertexBuffers       = new LRVertexBuffer();
+    protected volatile Map<BlockRenderLayer, BufferBuilder>          layerBufferBuilders = new EnumMap<>(BlockRenderLayer.class);
+    protected          Set<BlockPos>                                 tileEntities        = new HashSet<>();
+    protected          boolean                                       useCache;
+    protected          AtomicReference<CacheState>                   cacheState;
+    protected          int                                           maxProgress;
+    protected          Thread                                        thread;
+    protected          EntityCamera                                  viewEntity;
+    protected          int                                           clearColor;
+    private            Consumer<WorldSceneRenderer>                  beforeRender;
+    private            Consumer<WorldSceneRenderer>                  afterRender;
+    private            Consumer<RayTraceResult>                      onLookingAt;
+    private            RayTraceResult                                lastTraceResult;
+    private            Vector3f                                      eyePos              = new Vector3f(0, 0, 10f);
+    private            Vector3f                                      lookAt              = new Vector3f(0, 0, 0);
+    private            Vector3f                                      worldUp             = new Vector3f(0, 1, 0);
 
     public WorldSceneRenderer(LRDummyWorld world) {
         this.dummyWorld = world;
         renderedBlocksMap = new LRMap<>(new ConcurrentHashMap<>(), new ConcurrentHashMap<>());
         cacheState = new AtomicReference<>(CacheState.UNUSED);
     }
 
+    protected static boolean isMouseOver(final PositionedRect positionedRect, final int mouseX, final int mouseY) {
+        return mouseX > positionedRect.position.x && mouseX < positionedRect.position.x + positionedRect.size.width
+            && mouseY > positionedRect.position.y && mouseY < positionedRect.position.y + positionedRect.size.height;
+    }
+
+    public static void setDefaultPassRenderState(int pass) {
+        GlStateManager.color(1, 1, 1, 1);
+        if (pass == 0) { // SOLID
+            GlStateManager.enableDepth();
+            GlStateManager.disableBlend();
+            GlStateManager.depthMask(true);
+            GlStateManager.shadeModel(7424);
+        } else { // TRANSLUCENT
+            GlStateManager.disableBlend();
+            GlStateManager.enableCull();
+            GlStateManager.tryBlendFuncSeparate(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA, GlStateManager.SourceFactor.ONE, GlStateManager.DestFactor.ZERO);
+            GlStateManager.alphaFunc(516, 0.1F);
+            GlStateManager.enableBlend();
+            GlStateManager.depthMask(false);
+            Minecraft.getMinecraft().getTextureManager().bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
+            GlStateManager.shadeModel(7425);
+        }
+    }
+
     public WorldSceneRenderer useCacheBuffer(boolean useCache) {
         if (this.useCache == useCache || !Minecraft.getMinecraft().isCallingFromMinecraftThread()) {
             return this;
@@ -163,8 +193,8 @@ public WorldSceneRenderer deleteCacheBuffer() {
                     }
                 });
                 layerBufferBuilders.values().stream()
-                        .filter(buffer -> buffer != null)
-                        .forEach(BufferBuilderPool::returnBuffer);
+                                   .filter(buffer -> buffer != null)
+                                   .forEach(BufferBuilderPool::returnBuffer);
                 layerBufferBuilders.clear();
             });
         }
@@ -255,11 +285,6 @@ public void render(float x, float y, float width, float height, int mouseX, int
         resetCamera();
     }
 
-    protected static boolean isMouseOver(final PositionedRect positionedRect, final int mouseX, final int mouseY) {
-        return mouseX > positionedRect.position.x && mouseX < positionedRect.position.x + positionedRect.size.width
-                && mouseY > positionedRect.position.y && mouseY < positionedRect.position.y + positionedRect.size.height;
-    }
-
     public Vector3f getEyePos() {
         return eyePos;
     }
@@ -430,6 +455,15 @@ public VertexBuffer[] getVertexBuffers() {
         return vertexBuffers.getBuffer();
     }
 
+    public WorldSceneRenderer setVertexBuffers(VertexBuffer[] vertexBuffers) {
+        this.vertexBuffers.setBuffer(vertexBuffers).setAnotherBuffer(vertexBuffers);
+        for (int j = 0; j < BlockRenderLayer.values().length; ++j) {
+            this.vertexBuffers.getBuffer()[j] = new VertexBuffer(DefaultVertexFormats.BLOCK);
+            this.vertexBuffers.getAnotherBuffer()[j] = new VertexBuffer(DefaultVertexFormats.BLOCK);
+        }
+        return this;
+    }
+
     protected BufferBuilder getLayerBufferBuilder(final BlockRenderLayer layer) {
         BufferBuilder builder = layerBufferBuilders.get(layer);
         if (builder != null) {
@@ -444,24 +478,15 @@ protected BufferBuilder getLayerBufferBuilder(final BlockRenderLayer layer) {
         return builder;
     }
 
-    public WorldSceneRenderer setVertexBuffers(VertexBuffer[] vertexBuffers) {
-        this.vertexBuffers.setBuffer(vertexBuffers).setAnotherBuffer(vertexBuffers);
-        for (int j = 0; j < BlockRenderLayer.values().length; ++j) {
-            this.vertexBuffers.getBuffer()[j] = new VertexBuffer(DefaultVertexFormats.BLOCK);
-            this.vertexBuffers.getAnotherBuffer()[j] = new VertexBuffer(DefaultVertexFormats.BLOCK);
-        }
-        return this;
-    }
-
     public void refreshCache() {
         if (isCompiling() || isCompilerThreadAlive()) {
             return;
         }
         cacheState.set(CacheState.COMPILING);
         progress.set(0);
         maxProgress = renderedBlocksMap.getAnotherMap().keySet().stream()
-                .map(Collection::size)
-                .reduce(0, Integer::sum) * 11;
+                                       .map(Collection::size)
+                                       .reduce(0, Integer::sum) * 11;
 
         BlockRenderLayer oldRenderLayer = MinecraftForgeClient.getRenderLayer();
         Minecraft mc = Minecraft.getMinecraft();
@@ -633,7 +658,9 @@ private void renderBlocks(final boolean checkDisabledModel,
 //            }
             IBlockState state = world.getBlockState(pos);
             Block block = state.getBlock();
-            if (block == Blocks.AIR) continue;
+            if (block == Blocks.AIR) {
+                continue;
+            }
             state = state.getActualState(world, pos);
             if (block.canRenderInLayer(state, layer)) {
                 rendererDispatcher.renderBlock(state, pos, world, buffer);
@@ -685,25 +712,6 @@ private void renderTESR(final int pass, float particle, boolean checkDisabledMod
         RenderHelper.disableStandardItemLighting();
     }
 
-    public static void setDefaultPassRenderState(int pass) {
-        GlStateManager.color(1, 1, 1, 1);
-        if (pass == 0) { // SOLID
-            GlStateManager.enableDepth();
-            GlStateManager.disableBlend();
-            GlStateManager.depthMask(true);
-            GlStateManager.shadeModel(7424);
-        } else { // TRANSLUCENT
-            GlStateManager.disableBlend();
-            GlStateManager.enableCull();
-            GlStateManager.tryBlendFuncSeparate(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA, GlStateManager.SourceFactor.ONE, GlStateManager.DestFactor.ZERO);
-            GlStateManager.alphaFunc(516, 0.1F);
-            GlStateManager.enableBlend();
-            GlStateManager.depthMask(false);
-            Minecraft.getMinecraft().getTextureManager().bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
-            GlStateManager.shadeModel(7425);
-        }
-    }
-
     public RayTraceResult rayTrace(Vector3f hitPos) {
         Vec3d startPos = new Vec3d(this.eyePos.x, this.eyePos.y, this.eyePos.z);
         hitPos.scale(2); // Double view range to ensure pos can be seen.
@@ -829,4 +837,11 @@ protected Vector3f blockPos2ScreenPos(BlockPos pos, boolean depth, int x, int y,
         return winPos;
     }
 
+    enum CacheState {
+        UNUSED,
+        NEED,
+        COMPILING,
+        COMPILED
+    }
+
 }

src/main/java/com/cleanroommc/client/util/BlockInfo.java

@@ -16,10 +16,10 @@ public class BlockInfo {
 
     public static final BlockInfo EMPTY = new BlockInfo(Blocks.AIR);
 
-    private final IBlockState blockState;
-    private TileEntity tileEntity;
-    private final ItemStack itemStack;
-    private NBTTagCompound teTag;
+    private final IBlockState    blockState;
+    private final ItemStack      itemStack;
+    private       TileEntity     tileEntity;
+    private       NBTTagCompound teTag;
 
     public BlockInfo(Block block) {
         this(block.getDefaultState());
@@ -52,14 +52,11 @@ public static BlockInfo fromBlockState(IBlockState state) {
                     return new BlockInfo(state, tileEntity);
                 }
             }
-        } catch (Exception ignored){ }
+        } catch (Exception ignored) {
+        }
         return new BlockInfo(state);
     }
 
-    public void setTileEntity(TileEntity tileEntity) {
-        this.tileEntity = tileEntity;
-    }
-
     public IBlockState getBlockState() {
         return blockState;
     }
@@ -68,6 +65,10 @@ public TileEntity getTileEntity() {
         return tileEntity;
     }
 
+    public void setTileEntity(TileEntity tileEntity) {
+        this.tileEntity = tileEntity;
+    }
+
     public ItemStack getItemStackForm() {
         return itemStack == null ? new ItemStack(Item.getItemFromBlock(blockState.getBlock()), 1, blockState.getBlock().damageDropped(blockState)) : itemStack;
     }

src/main/java/com/cleanroommc/client/util/EntityCamera.java

@@ -27,13 +27,11 @@ public void setPositionAndRotation(double x, double y, double z, float yaw, floa
         this.prevRotationPitch = this.rotationPitch;
         double d0 = this.prevRotationYaw - yaw;
 
-        if (d0 < -180.0D)
-        {
+        if (d0 < -180.0D) {
             this.prevRotationYaw += 360.0F;
         }
 
-        if (d0 >= 180.0D)
-        {
+        if (d0 >= 180.0D) {
             this.prevRotationYaw -= 360.0F;
         }