Show previews for multiblocks that contain searched item (#22)

Author: Lyfts

dependencies.gradle

@@ -1,8 +1,9 @@
 // Add your dependencies here
 
 dependencies {
-    api('com.github.GTNewHorizons:StructureLib:1.3.4:dev')
-    implementation("com.github.GTNewHorizons:GT5-Unofficial:5.09.49.68:dev")
+    api('com.github.GTNewHorizons:StructureLib:1.3.5:dev')
+    api('com.github.GTNewHorizons:GTNHLib:0.5.20:dev')
+    implementation("com.github.GTNewHorizons:GT5-Unofficial:5.09.50.65:dev")
     compileOnly("com.github.GTNewHorizons:NotEnoughEnergistics:1.6.4:dev")
 
     runtimeOnlyNonPublishable("com.github.GTNewHorizons:StructureCompat:0.6.5:dev")

settings.gradle

@@ -17,7 +17,7 @@ pluginManagement {
 }
 
 plugins {
-    id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.27'
+    id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.29'
 }
 
 

src/main/java/blockrenderer6343/BlockRenderer6343.java

@@ -19,12 +19,12 @@
         version = Tags.VERSION,
         name = BlockRenderer6343.MOD_NAME,
         acceptedMinecraftVersions = "[1.7.10]",
-        dependencies = "required-after:NotEnoughItems;required-after:structurelib")
+        dependencies = "required-after:NotEnoughItems;required-after:structurelib;required-after:gtnhlib;")
 public class BlockRenderer6343 {
 
     public static final String MOD_ID = "blockrenderer6343";
     public static final String MOD_NAME = "BlockRenderer6343";
-    public static Logger LOG = LogManager.getLogger(MOD_ID);
+    public static final Logger LOG = LogManager.getLogger(MOD_ID);
 
     @SidedProxy(clientSide = MOD_ID + ".ClientProxy", serverSide = MOD_ID + ".CommonProxy")
     public static CommonProxy proxy;
@@ -37,10 +37,10 @@ public class BlockRenderer6343 {
     // preInit "Run before anything else. Read your config, create blocks, items,
     // etc, and register them with the GameRegistry."
     public void preInit(FMLPreInitializationEvent event) {
-        proxy.preInit(event);
         isGTLoaded = Loader.isModLoaded("gregtech");
         isBartworksLoaded = Loader.isModLoaded("bartworks");
         isNEELoaded = Loader.isModLoaded("neenergistics");
+        proxy.preInit(event);
     }
 
     @Mod.EventHandler

src/main/java/blockrenderer6343/ClientProxy.java

@@ -1,9 +1,6 @@
 package blockrenderer6343;
 
-import net.minecraftforge.common.MinecraftForge;
-
 import blockrenderer6343.client.world.TrackedDummyWorld;
-import blockrenderer6343.integration.nei.IMCForNEI;
 import blockrenderer6343.integration.nei.InputHandler;
 import codechicken.nei.guihook.GuiContainerManager;
 import cpw.mods.fml.common.event.FMLInitializationEvent;
@@ -19,18 +16,18 @@ public void preInit(FMLPreInitializationEvent event) {
         super.preInit(event);
         GuiContainerManager.addInputHandler(new InputHandler());
         GuiContainerManager.addTooltipHandler(new InputHandler());
-        GregTechAPI.addDummyWorld(TrackedDummyWorld.class);
+        if (BlockRenderer6343.isGTLoaded) {
+            GregTechAPI.addDummyWorld(TrackedDummyWorld.class);
+        }
     }
 
     // load "Do your mod setup. Build whatever data structures you care about. Register recipes."
     public void init(FMLInitializationEvent event) {
         super.init(event);
-        IMCForNEI.IMCSender();
     }
 
     // postInit "Handle interaction with other mods, complete your setup based on this."
     public void postInit(FMLPostInitializationEvent event) {
         super.postInit(event);
-        MinecraftForge.EVENT_BUS.register(new EventHandler());
     }
 }

src/main/java/blockrenderer6343/Config.java

@@ -14,7 +14,7 @@
 
 public class CreativeItemSource implements IItemSource {
 
-    public static CreativeItemSource instance;
+    public static final CreativeItemSource instance;
 
     static {
         instance = new CreativeItemSource();

src/main/java/blockrenderer6343/EventHandler.java

@@ -2,11 +2,11 @@
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.ScaledResolution;
-import net.minecraft.world.World;
 
 import org.lwjgl.opengl.GL11;
 
 import blockrenderer6343.api.utils.PositionedRect;
+import blockrenderer6343.client.world.TrackedDummyWorld;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 
@@ -21,7 +21,7 @@
 @SideOnly(Side.CLIENT)
 public class ImmediateWorldSceneRenderer extends WorldSceneRenderer {
 
-    public ImmediateWorldSceneRenderer(World world) {
+    public ImmediateWorldSceneRenderer(TrackedDummyWorld world) {
         super(world);
     }
 

src/main/java/blockrenderer6343/api/utils/BlockPosition.java

@@ -31,9 +31,6 @@
 import static org.lwjgl.opengl.GL11.glPushMatrix;
 import static org.lwjgl.opengl.GL11.glViewport;
 
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Set;
 import java.util.function.Consumer;
 
 import net.minecraft.block.Block;
@@ -47,23 +44,25 @@
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.MovingObjectPosition;
 import net.minecraft.util.Vec3;
-import net.minecraft.world.World;
 import net.minecraftforge.client.ForgeHooksClient;
 
 import org.lwjgl.opengl.GL12;
 import org.lwjgl.util.glu.GLU;
 import org.lwjgl.util.vector.Vector3f;
 
+import com.gtnewhorizon.gtnhlib.util.CoordinatePacker;
+
 import bartworks.common.blocks.BWBlocksGlass;
 import blockrenderer6343.BlockRenderer6343;
-import blockrenderer6343.api.utils.BlockPosition;
 import blockrenderer6343.api.utils.Position;
 import blockrenderer6343.api.utils.PositionedRect;
 import blockrenderer6343.api.utils.Size;
 import blockrenderer6343.client.utils.ProjectionUtils;
 import blockrenderer6343.client.world.TrackedDummyWorld;
 import codechicken.lib.vec.Vector3;
 import gregtech.common.render.GTRendererBlock;
+import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
+import it.unimi.dsi.fastutil.longs.LongSet;
 
 /**
  * Created with IntelliJ IDEA.
@@ -75,9 +74,9 @@
 public abstract class WorldSceneRenderer {
 
     // you have to place blocks in the world before use
-    public final World world;
+    public final TrackedDummyWorld world;
     // the Blocks which this renderer needs to render
-    public final Set<BlockPosition> renderedBlocks = new HashSet<>();
+    public final LongSet renderedBlocks = new LongOpenHashSet();
     private Consumer<WorldSceneRenderer> beforeRender;
     private Consumer<WorldSceneRenderer> onRender;
     private Consumer<MovingObjectPosition> onLookingAt;
@@ -88,7 +87,7 @@ public abstract class WorldSceneRenderer {
     private Vector3f worldUp = new Vector3f(0, 1, 0);
     private boolean renderAllFaces = false;
 
-    public WorldSceneRenderer(World world) {
+    public WorldSceneRenderer(TrackedDummyWorld world) {
         this.world = world;
     }
 
@@ -102,7 +101,7 @@ public WorldSceneRenderer setOnWorldRender(Consumer<WorldSceneRenderer> callback
         return this;
     }
 
-    public WorldSceneRenderer addRenderedBlocks(Collection<BlockPosition> blocks) {
+    public WorldSceneRenderer addRenderedBlocks(LongSet blocks) {
         if (blocks != null) {
             this.renderedBlocks.addAll(blocks);
         }
@@ -277,8 +276,11 @@ protected void drawWorld() {
         tessellator.startDrawingQuads();
         try {
             tessellator.setBrightness(15 << 20 | 15 << 4);
-            for (BlockPosition pos : renderedBlocks) {
-                Block block = world.getBlock(pos.x, pos.y, pos.z);
+            for (long pos : renderedBlocks) {
+                int x = CoordinatePacker.unpackX(pos);
+                int y = CoordinatePacker.unpackY(pos);
+                int z = CoordinatePacker.unpackZ(pos);
+                Block block = world.getBlock(x, y, z);
                 if (block.equals(Blocks.air)) continue;
 
                 RenderBlocks bufferBuilder = new RenderBlocks();
@@ -289,25 +291,19 @@ protected void drawWorld() {
                     // this mod cannot render renderpass = 1 blocks for now
                     bufferBuilder.renderStandardBlockWithColorMultiplier(
                             block,
-                            pos.x,
-                            pos.y,
-                            pos.z,
-                            bwGlass.getColor(world.getBlockMetadata(pos.x, pos.y, pos.z))[0] / 255f,
-                            bwGlass.getColor(world.getBlockMetadata(pos.x, pos.y, pos.z))[1] / 255f,
-                            bwGlass.getColor(world.getBlockMetadata(pos.x, pos.y, pos.z))[2] / 255f);
+                            x,
+                            y,
+                            z,
+                            bwGlass.getColor(world.getBlockMetadata(x, y, z))[0] / 255f,
+                            bwGlass.getColor(world.getBlockMetadata(x, y, z))[1] / 255f,
+                            bwGlass.getColor(world.getBlockMetadata(x, y, z))[2] / 255f);
                 } else if (BlockRenderer6343.isGTLoaded) {
-                    if (!GTRendererBlock.INSTANCE.renderWorldBlock(
-                            world,
-                            pos.x,
-                            pos.y,
-                            pos.z,
-                            block,
-                            block.getRenderType(),
-                            bufferBuilder)) {
-                        bufferBuilder.renderBlockByRenderType(block, pos.x, pos.y, pos.z);
+                    if (!GTRendererBlock.INSTANCE
+                            .renderWorldBlock(world, x, y, z, block, block.getRenderType(), bufferBuilder)) {
+                        bufferBuilder.renderBlockByRenderType(block, x, y, z);
                     }
                 } else {
-                    bufferBuilder.renderBlockByRenderType(block, pos.x, pos.y, pos.z);
+                    bufferBuilder.renderBlockByRenderType(block, x, y, z);
                 }
             }
             if (onRender != null) {
@@ -327,12 +323,15 @@ protected void drawWorld() {
         for (int pass = 0; pass < 2; pass++) {
             ForgeHooksClient.setRenderPass(pass);
             int finalPass = pass;
-            renderedBlocks.forEach(blockPosition -> {
+            renderedBlocks.forEach(pos -> {
+                int x = CoordinatePacker.unpackX(pos);
+                int y = CoordinatePacker.unpackY(pos);
+                int z = CoordinatePacker.unpackZ(pos);
                 setDefaultPassRenderState(finalPass);
-                TileEntity tile = world.getTileEntity(blockPosition.x, blockPosition.y, blockPosition.z);
+                TileEntity tile = world.getTileEntity(x, y, z);
                 if (tile != null && tesr.hasSpecialRenderer(tile)) {
                     if (tile.shouldRenderInPass(finalPass)) {
-                        tesr.renderTileEntityAt(tile, blockPosition.x, blockPosition.y, blockPosition.z, 0);
+                        tesr.renderTileEntityAt(tile, x, y, z, 0);
                     }
                 }
             });
@@ -363,6 +362,6 @@ public MovingObjectPosition rayTrace(Vector3f lookVec) {
                 (lookVec.x + startPos.xCoord),
                 (lookVec.y + startPos.yCoord),
                 (lookVec.z + startPos.zCoord));
-        return ((TrackedDummyWorld) this.world).rayTraceBlockswithTargetMap(startPos, endPos, renderedBlocks);
+        return this.world.rayTraceBlocksWithTargetMap(startPos, endPos, renderedBlocks);
     }
 }