fix cube faces rendering order (#22)

* fix cube faces rendering order

Signed-off-by: Glease <4586901+Glease@users.noreply.github.com>

* spotless

Signed-off-by: Glease <4586901+Glease@users.noreply.github.com>

* address review

Signed-off-by: Glease <4586901+Glease@users.noreply.github.com>

---------

Signed-off-by: Glease <4586901+Glease@users.noreply.github.com>

.github/workflows/pages.yml

@@ -1,47 +0,0 @@
-# Simple workflow for deploying static content to GitHub Pages
-name: Deploy static content to Pages
-
-on:
-  # Runs on pushes targeting the default branch
-  push:
-    branches: ["gh-pages"]
-
-  # Allows you to run this workflow manually from the Actions tab
-  workflow_dispatch:
-
-# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
-permissions:
-  contents: read
-  pages: write
-  id-token: write
-
-# Allow one concurrent deployment
-concurrency:
-  group: "pages"
-  cancel-in-progress: true
-
-jobs:
-  # Single deploy job since we're just deploying
-  deploy:
-    environment:
-      name: github-pages
-      url: ${{ steps.deployment.outputs.page_url }}
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-      - name: Setup Pages
-        uses: actions/configure-pages@v2
-      - name: Generate Index
-        shell: bash
-        run: |
-          find . -name javadoc -type d -print > index.txt
-          echo feature/doc >> index.txt
-      - name: Upload artifact
-        uses: actions/upload-pages-artifact@v1
-        with:
-          # Upload entire repository
-          path: '.'
-      - name: Deploy to GitHub Pages
-        id: deployment
-        uses: actions/deploy-pages@v1

.github/workflows/publish-javadoc.yaml

@@ -20,13 +20,16 @@ jobs:
     outputs:
       result_hash: ${{ steps.deploy.outputs.hash }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
-      - uses: actions/setup-java@v2
+      - uses: actions/setup-java@v3
         with:
-          java-version: 8
+          java-version: |
+            8
+            11
+            17
           distribution: 'temurin'
           cache: gradle
 
@@ -51,7 +54,7 @@ jobs:
             echo Nothing to deploy
             exit 0
           fi
-          find . -name javadoc -type d -print | sed 's#^\./\(.*\)/javadoc$#\1#' > index.txt
+          find . -name javadoc -type d -print | sed 's#^\./\(.*\)/javadoc$#\1#' | sort --version-sort --reverse > index.txt
           git add index.txt
           git config user.name "${GITHUB_ACTOR}"
           git config user.email "${GITHUB_ACTOR}@users.noreply.github.com"

LICENSE.txt

@@ -0,0 +1,165 @@
+                   GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+  This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+  0. Additional Definitions.
+
+  As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+  "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+  An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+  A "Combined Work" is a work produced by combining or linking an
+Application with the Library.  The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+  The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+  The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+  1. Exception to Section 3 of the GNU GPL.
+
+  You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+  2. Conveying Modified Versions.
+
+  If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+   a) under this License, provided that you make a good faith effort to
+   ensure that, in the event an Application does not supply the
+   function or data, the facility still operates, and performs
+   whatever part of its purpose remains meaningful, or
+
+   b) under the GNU GPL, with none of the additional permissions of
+   this License applicable to that copy.
+
+  3. Object Code Incorporating Material from Library Header Files.
+
+  The object code form of an Application may incorporate material from
+a header file that is part of the Library.  You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+   a) Give prominent notice with each copy of the object code that the
+   Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the object code with a copy of the GNU GPL and this license
+   document.
+
+  4. Combined Works.
+
+  You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+   a) Give prominent notice with each copy of the Combined Work that
+   the Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the Combined Work with a copy of the GNU GPL and this license
+   document.
+
+   c) For a Combined Work that displays copyright notices during
+   execution, include the copyright notice for the Library among
+   these notices, as well as a reference directing the user to the
+   copies of the GNU GPL and this license document.
+
+   d) Do one of the following:
+
+       0) Convey the Minimal Corresponding Source under the terms of this
+       License, and the Corresponding Application Code in a form
+       suitable for, and under terms that permit, the user to
+       recombine or relink the Application with a modified version of
+       the Linked Version to produce a modified Combined Work, in the
+       manner specified by section 6 of the GNU GPL for conveying
+       Corresponding Source.
+
+       1) Use a suitable shared library mechanism for linking with the
+       Library.  A suitable mechanism is one that (a) uses at run time
+       a copy of the Library already present on the user's computer
+       system, and (b) will operate properly with a modified version
+       of the Library that is interface-compatible with the Linked
+       Version.
+
+   e) Provide Installation Information, but only if you would otherwise
+   be required to provide such information under section 6 of the
+   GNU GPL, and only to the extent that such information is
+   necessary to install and execute a modified version of the
+   Combined Work produced by recombining or relinking the
+   Application with a modified version of the Linked Version. (If
+   you use option 4d0, the Installation Information must accompany
+   the Minimal Corresponding Source and Corresponding Application
+   Code. If you use option 4d1, you must provide the Installation
+   Information in the manner specified by section 6 of the GNU GPL
+   for conveying Corresponding Source.)
+
+  5. Combined Libraries.
+
+  You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+   a) Accompany the combined library with a copy of the same work based
+   on the Library, uncombined with any other library facilities,
+   conveyed under the terms of this License.
+
+   b) Give prominent notice with the combined library that part of it
+   is a work based on the Library, and explaining where to find the
+   accompanying uncombined form of the same work.
+
+  6. Revised Versions of the GNU Lesser General Public License.
+
+  The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+  Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+  If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.

README.md

@@ -32,3 +32,5 @@ The project is developed using IDEA. Please manually configure the build to not
 Due to me adding in ItemStackMap, which was derived from code from CodeChicken's LGPL mod NEI. This mod is effectively considered
 licensed under LGPL in its entirety since commit ebef584b8c518f8202cfe0984fb28a6d23e52b3d or any squash commit containing it, e.g.
 609e50428ee4e293f65f67f554a70b9fcfae97c4.
+
+Note while the LICENSE.txt is added by a much later commit, all code on previous commits are covered by this as well.

addon.gradle

@@ -1,4 +1,10 @@
 javadoc {
+    javadocTool = javaToolchains.javadocToolFor {
+        // Last version with frames, but it also has search
+        languageVersion = JavaLanguageVersion.of(11)
+        vendor = JvmVendorSpec.ADOPTIUM
+    }
+
     inputs.file  "src/main/javadoc/overview.html"
 
     include "com/gtnewhorizon/structurelib/alignment/**"
@@ -14,6 +20,7 @@ javadoc {
         overview "src/main/javadoc/overview.html"
         links 'https://docs.oracle.com/javase/8/docs/api/'
         links 'https://skmedix.github.io/ForgeJavaDocs/javadoc/forge/1.7.10-10.13.4.1614/'
+        addBooleanOption("-frames", true)
     }
 }
 

dependencies.gradle

@@ -2,7 +2,7 @@
 
 dependencies {
     api("com.github.GTNewHorizons:GTNHLib:0.0.10:dev")
-    runtimeOnly("com.github.GTNewHorizons:NotEnoughItems:2.3.25-GTNH:dev")
+    runtimeOnly("com.github.GTNewHorizons:NotEnoughItems:2.3.46-GTNH:dev")
 
     testImplementation(platform('org.junit:junit-bom:5.9.2'))
     testImplementation('org.junit.jupiter:junit-jupiter')

src/main/java/com/gtnewhorizon/structurelib/ClientProxy.java

@@ -10,7 +10,6 @@ import net.minecraft.client.gui.GuiNewChat;
 import net.minecraft.client.particle.EntityFX;
 import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.client.renderer.culling.Frustrum;
-import net.minecraft.client.renderer.entity.RenderManager;
 import net.minecraft.client.renderer.texture.TextureMap;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
@@ -47,7 +46,6 @@ public class ClientProxy extends CommonProxy {
      */
     private static final List<HintGroup> allGroups = new ArrayList<>();
 
-    public static int HOLOGRAM_LIFETIME = 200;
     /**
      * Current batch of hints. Belongs to the same logical multiblock.
      */
@@ -271,10 +269,6 @@ public class ClientProxy extends CommonProxy {
         private final World w;
         // these are the block coordinate for e.g. w.getBlock()
         private final int x, y, z;
-        // these are the lower bounds for rendering. the upper bound would be X + size
-        // currently size is fixed to be 0.5
-        // it is not made into a constants because this will allow for easy changing during debug
-        private final double X, Y, Z;
         private final IIcon[] icons;
         private short[] tint;
         private boolean renderThrough;
@@ -286,9 +280,6 @@ public class ClientProxy extends CommonProxy {
             this.x = x;
             this.y = y;
             this.z = z;
-            X = x + 0.25;
-            Y = y + 0.25;
-            Z = z + 0.25;
             this.icons = icons;
             this.tint = tint;
         }
@@ -324,10 +315,11 @@ public class ClientProxy extends CommonProxy {
         }
 
         public boolean isInFrustrum(Frustrum frustrum) {
-            return frustrum.isBoxInFrustum(X, Y, Z, X + 0.5, Y + 0.5, Z + 0.5);
+            return frustrum.isBoxInFrustum(x + 0.25, y + 0.25, z + 0.25, x + 0.75, y + 0.75, z + 0.75);
         }
 
-        public void draw(Tessellator tes, double eyeX, double eyeY, double eyeZ) {
+        public void draw(Tessellator tes, double eyeX, double eyeY, double eyeZ, int eyeXint, int eyeYint,
+                int eyeZint) {
             double size = 0.5;
 
             int brightness = w.blockExists(x, 0, z) ? w.getLightBrightnessForSkyBlocks(x, y, z, 0) : 0;
@@ -339,70 +331,92 @@ public class ClientProxy extends CommonProxy {
                     (int) (tint[2] * 1F),
                     ConfigurationHandler.INSTANCE.getHintTransparency());
 
-            for (int i = 0; i < 6; i++) {
+            double X = (x - eyeXint) + 0.25;
-                if (icons[i] == null) continue;
+            double Y = (y - eyeYint) + 0.25;
+            double Z = (z - eyeZint) + 0.25;
+            double worldX = x + 0.25;
+            double worldY = y + 0.25;
+            double worldZ = z + 0.25;
 
-                markTextureUsed(icons[i]);
+            // this rendering code is independently written by glee8e on July 10th, 2023
+            // and is released as part of StructureLib under LGPL terms, just like everything else in this project
+            // cube is a very special model. its facings can be rendered correctly by viewer distance without using
+            // surface normals and view vector
+            // here we do a 2 pass render.
+            // first pass we draw obstructed faces (i.e. faces that are further away from player)
+            // second pass we draw unobstructed faces
+            for (int j = 0; j < 2; j++) {
+                boolean unobstructedPass = j == 1;
+                for (int i = 0; i < 6; i++) {
+                    if (icons[i] == null) continue;
 
-                double u = icons[i].getMinU();
+                    markTextureUsed(icons[i]);
-                double U = icons[i].getMaxU();
-                double v = icons[i].getMinV();
-                double V = icons[i].getMaxV();
 
-                // cube is a very special model. its facings can be rendered correctly by viewer distance without using
+                    double u = icons[i].getMinU();
-                // surface normals and view vector
+                    double U = icons[i].getMaxU();
-                // here we do a 2 pass render.
+                    double v = icons[i].getMinV();
-                // first pass we draw obstructed faces (i.e. faces that are further away from player)
+                    double V = icons[i].getMaxV();
-                // second pass we draw unobstructed faces
-                for (int j = 0; j < 2; j++) {
                     switch (i) { // {DOWN, UP, NORTH, SOUTH, WEST, EAST}
                         case 0:
-                            if ((Y >= eyeY) != (j == 1)) continue;
+                            // all these ifs is in form if ((is face unobstructed) != (is in unobstructred pass))
+                            if ((worldY >= eyeY) != unobstructedPass) continue;
                             tes.setNormal(0, -1, 0);
                             tes.addVertexWithUV(X, Y, Z + size, u, V);
                             tes.addVertexWithUV(X, Y, Z, u, v);
                             tes.addVertexWithUV(X + size, Y, Z, U, v);
+                            tes.addVertexWithUV(X + size, Y, Z, U, v);
                             tes.addVertexWithUV(X + size, Y, Z + size, U, V);
+                            tes.addVertexWithUV(X, Y, Z + size, u, V);
                             break;
                         case 1:
-                            if ((Y + size <= eyeY) != (j == 1)) continue;
+                            if ((worldY + size <= eyeY) != unobstructedPass) continue;
                             tes.setNormal(0, 1, 0);
                             tes.addVertexWithUV(X, Y + size, Z, u, v);
                             tes.addVertexWithUV(X, Y + size, Z + size, u, V);
                             tes.addVertexWithUV(X + size, Y + size, Z + size, U, V);
+                            tes.addVertexWithUV(X + size, Y + size, Z + size, U, V);
                             tes.addVertexWithUV(X + size, Y + size, Z, U, v);
+                            tes.addVertexWithUV(X, Y + size, Z, u, v);
                             break;
                         case 2:
-                            if ((Z >= eyeZ) != (j == 1)) continue;
+                            if ((worldZ >= eyeZ) != unobstructedPass) continue;
                             tes.setNormal(0, 0, -1);
                             tes.addVertexWithUV(X, Y, Z, U, V);
                             tes.addVertexWithUV(X, Y + size, Z, U, v);
                             tes.addVertexWithUV(X + size, Y + size, Z, u, v);
+                            tes.addVertexWithUV(X + size, Y + size, Z, u, v);
                             tes.addVertexWithUV(X + size, Y, Z, u, V);
+                            tes.addVertexWithUV(X, Y, Z, U, V);
                             break;
                         case 3:
-                            if ((Z <= eyeZ) != (j == 1)) continue;
+                            if ((worldZ + size <= eyeZ) != unobstructedPass) continue;
                             tes.setNormal(0, 0, 1);
                             tes.addVertexWithUV(X + size, Y, Z + size, U, V);
                             tes.addVertexWithUV(X + size, Y + size, Z + size, U, v);
                             tes.addVertexWithUV(X, Y + size, Z + size, u, v);
+                            tes.addVertexWithUV(X, Y + size, Z + size, u, v);
                             tes.addVertexWithUV(X, Y, Z + size, u, V);
+                            tes.addVertexWithUV(X + size, Y, Z + size, U, V);
                             break;
                         case 4:
-                            if ((X >= eyeX) != (j == 1)) continue;
+                            if ((worldX >= eyeX) != unobstructedPass) continue;
                             tes.setNormal(-1, 0, 0);
                             tes.addVertexWithUV(X, Y, Z + size, U, V);
                             tes.addVertexWithUV(X, Y + size, Z + size, U, v);
                             tes.addVertexWithUV(X, Y + size, Z, u, v);
+                            tes.addVertexWithUV(X, Y + size, Z, u, v);
                             tes.addVertexWithUV(X, Y, Z, u, V);
+                            tes.addVertexWithUV(X, Y, Z + size, U, V);
                             break;
                         case 5:
-                            if ((X + size <= eyeX) != (j == 1)) continue;
+                            if ((worldX + size <= eyeX) != unobstructedPass) continue;
                             tes.setNormal(1, 0, 0);
                             tes.addVertexWithUV(X + size, Y, Z, U, V);
                             tes.addVertexWithUV(X + size, Y + size, Z, U, v);
                             tes.addVertexWithUV(X + size, Y + size, Z + size, u, v);
+                            tes.addVertexWithUV(X + size, Y + size, Z + size, u, v);
                             tes.addVertexWithUV(X + size, Y, Z + size, u, V);
+                            tes.addVertexWithUV(X + size, Y, Z, U, V);
                             break;
                     }
                 }
@@ -414,7 +428,7 @@ public class ClientProxy extends CommonProxy {
         }
 
         public double getSquareDistanceTo(Vec3 point) {
-            return point.squareDistanceTo(X, Y, Z);
+            return point.squareDistanceTo(x + 0.5, y + 0.5, z + 0.5);
         }
     }
 
@@ -501,6 +515,7 @@ public class ClientProxy extends CommonProxy {
                     + (entitylivingbase.posY - entitylivingbase.lastTickPosY) * e.partialTicks;
             double d2 = entitylivingbase.lastTickPosZ
                     + (entitylivingbase.posZ - entitylivingbase.lastTickPosZ) * e.partialTicks;
+            int i0 = (int) d0, i1 = (int) d1, i2 = (int) d2;
             frustrum.setPosition(d0, d1, d2);
 
             GL11.glPushMatrix();
@@ -513,25 +528,34 @@ public class ClientProxy extends CommonProxy {
             // depth test begin as enabled
             boolean renderThrough = false;
             Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture);
-            GL11.glTranslated(-RenderManager.renderPosX, -RenderManager.renderPosY, -RenderManager.renderPosZ);
+            GL11.glTranslated(-d0 + i0, -d1 + i1, -d2 + i2);
             Tessellator tes = Tessellator.instance;
-            tes.startDrawingQuads();
+            tes.startDrawing(GL11.GL_TRIANGLES);
-            for (int i = 0, allHintsForRenderSize = allHintsForRender.size(); i < allHintsForRenderSize; i++) {
+            for (int i = 0, allHintsForRenderSize = allHintsForRender.size(), cubeDrawn = 0; i
+                    < allHintsForRenderSize; i++, cubeDrawn++) {
                 HintParticleInfo hint = allHintsForRender.get(i);
                 if (!hint.isInFrustrum(frustrum)) continue;
                 if (renderThrough != hint.renderThrough) {
                     if (i > 0) {
                         p.endStartSection("Draw");
                         tes.draw();
-                        tes.startDrawingQuads();
+                        tes.startDrawing(GL11.GL_TRIANGLES);
+                        cubeDrawn = 0;
                         p.endStartSection("Prepare");
                     }
                     if (hint.renderThrough) GL11.glDisable(GL11.GL_DEPTH_TEST);
                     else GL11.glEnable(GL11.GL_DEPTH_TEST);
                     renderThrough = hint.renderThrough;
                 }
-                // TODO verify if we need to add eyeHeight
+                // Minecraft Tessellator draw in batch of 4096. This plays nicely with quads, but for trigs
-                hint.draw(tes, d0, d1, d2);
+                // it might occasionally end up with one half in first batch and the other half in later batch.
+                // so we manually flush the buffer here if that would happen.
+                // 6 faces per particle, 2 trig per face, 3 vertex per trig
+                if ((cubeDrawn + 1) >= 4096 / (6 * 2 * 3)) {
+                    tes.draw();
+                    tes.startDrawing(GL11.GL_TRIANGLES);
+                }
+                hint.draw(tes, d0, d1, d2, i0, i1, i2);
             }
             p.endStartSection("Draw");
             tes.draw();

src/main/java/com/gtnewhorizon/structurelib/alignment/constructable/IMultiblockInfoContainer.java

@@ -8,7 +8,9 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 
 import com.gtnewhorizon.structurelib.alignment.enumerable.ExtendedFacing;
+import com.gtnewhorizon.structurelib.structure.AutoPlaceEnvironment;
 import com.gtnewhorizon.structurelib.structure.IItemSource;
+import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
@@ -41,24 +43,35 @@ public interface IMultiblockInfoContainer<T> {
 
     /**
      * Construct the structure using
-     * {@link com.gtnewhorizon.structurelib.structure.IStructureElement#survivalPlaceBlock(Object, World, int, int, int, ItemStack, IItemSource, EntityPlayerMP, java.util.function.Consumer)}
+     * {@link com.gtnewhorizon.structurelib.structure.IStructureElement#survivalPlaceBlock(Object, World, int, int, int, ItemStack, AutoPlaceEnvironment)}
-     * 
+     *
      * @return -1 if done, a helping pointer
      */
-    default int survivalConstruct(ItemStack stackSize, int elementBudge, IItemSource source,
+    int survivalConstruct(ItemStack stackSize, int elementBudge, ISurvivalBuildEnvironment env, T tileEntity,
-            EntityPlayerMP actorProfile, T tileEntity, ExtendedFacing aSide) {
+            ExtendedFacing aSide);
-        return -1;
-    }
 
     @SideOnly(Side.CLIENT)
     String[] getDescription(ItemStack stackSize);
 
-    /**
+    default ISurvivalConstructable toConstructable(T tileEntity, ExtendedFacing aSide) {
-     * Override this and return {@link #toConstructable(IMultiblockInfoContainer, Object, ExtendedFacing)} if
+        return new ISurvivalConstructable() {
-     * {@link #survivalConstruct(ItemStack, int, IItemSource, EntityPlayerMP, Object, ExtendedFacing)} isn't a stub
+
-     */
+            @Override
-    default IConstructable toConstructable(T tileEntity, ExtendedFacing aSide) {
+            public int survivalConstruct(ItemStack stackSize, int elementBudget, ISurvivalBuildEnvironment env) {
-        return new IConstructable() {
+                return IMultiblockInfoContainer.this
+                        .survivalConstruct(stackSize, elementBudget, env, tileEntity, aSide);
+            }
+
+            @Override
+            public int survivalConstruct(ItemStack stackSize, int elementBudget, IItemSource source,
+                    EntityPlayerMP actor) {
+                return IMultiblockInfoContainer.this.survivalConstruct(
+                        stackSize,
+                        elementBudget,
+                        ISurvivalBuildEnvironment.create(source, actor),
+                        tileEntity,
+                        aSide);
+            }
 
             @Override
             public void construct(ItemStack stackSize, boolean hintsOnly) {
@@ -71,26 +84,4 @@ public interface IMultiblockInfoContainer<T> {
             }
         };
     }
-
-    static <T> ISurvivalConstructable toConstructable(IMultiblockInfoContainer<T> thiz, T tileEntity,
-            ExtendedFacing aSide) {
-        return new ISurvivalConstructable() {
-
-            @Override
-            public int survivalConstruct(ItemStack stackSize, int elementBudget, IItemSource source,
-                    EntityPlayerMP actor) {
-                return thiz.survivalConstruct(stackSize, elementBudget, source, actor, tileEntity, aSide);
-            }
-
-            @Override
-            public void construct(ItemStack stackSize, boolean hintsOnly) {
-                thiz.construct(stackSize, hintsOnly, tileEntity, aSide);
-            }
-
-            @Override
-            public String[] getStructureDescription(ItemStack stackSize) {
-                return thiz.getDescription(stackSize);
-            }
-        };
-    }
 }

src/main/java/com/gtnewhorizon/structurelib/structure/StructureUtility.java

@@ -42,54 +42,54 @@ import cpw.mods.fml.common.registry.GameRegistry;
 
 /**
  * A brief index of everything contained
- * <h1>Control blocks</h1> A lot of these might seem to make more sense as a default function on
+ * <h2>Control blocks</h2> A lot of these might seem to make more sense as a default function on
  * {@link IStructureElement}. However, in that case javac generic will often fail to infer the type for you, so we have
  * to define them as static methods
- * <h1>If block</h1> Provide if block, allowing downstream call only if user specified conditions are meet (i.e.
+ * <h2>If block</h2> Provide if block, allowing downstream call only if user specified conditions are meet (i.e.
  * predicate returns true)
  * <ul>
  * <li>{@link #onlyIf(Predicate, IStructureElement)} and its overloads</li>
  * </ul>
- * <h1>Switch block</h1> Provide switch block, allowing to select a downstream element by using a key or index computed
+ * <h2>Switch block</h2> Provide switch block, allowing to select a downstream element by using a key or index computed
  * from trigger item and/or context object.
  * <ul>
  * <li>{@link #partitionBy(Function, IStructureElement[])} and its overloads</li>
  * </ul>
- * <h1>Or Chain</h1> Provide a short-circuiting OR chain.
+ * <h2>Or Chain</h2> Provide a short-circuiting OR chain.
  * <ul>
  * <li>{@link #ofChain(IStructureElement[])} and its overloads</li>
  * </ul>
- * <h2>Side effect</h2> Provide callbacks on various occasion
+ * <h3>Side effect</h3> Provide callbacks on various occasion
  * <ul>
  * <li>{@link #onElementPass(Consumer, IStructureElement)}: Call an callback upon element check success</li>
  * <li>{@link #onElementFail(Consumer, IStructureElement)}: Call an callback upon element check failure</li>
  * </ul>
  *
- * <h1>Other Primitives</h1>
+ * <h2>Other Primitives</h2>
- * <h2>Error statement</h2> Unconditionally return false.
+ * <h3>Error statement</h3> Unconditionally return false.
  * <ul>
  * <li>{@link #error()}</li>
  * </ul>
- * <h2>Context Object Change</h2> Switch the context object.
+ * <h3>Context Object Change</h3> Switch the context object.
  * <ul>
  * <li>{@link #withContext(IStructureElement)}: switch context to the extended context</li>
  * </ul>
- * <h2>Channel Change</h2> Change the channel. See <a href="{@docRoot}/overview-summary.html#channels">Channels section
+ * <h3>Channel Change</h3> Change the channel. See <a href="{@docRoot}/overview-summary.html#channels">Channels section
  * on overview</a> for more information.
  * <ul>
  * <li>{@link #withChannel(String, IStructureElement)}: switch channel using
  * {@link ChannelDataAccessor#withChannel(ItemStack, String)} when a trigger item is present.</li>
  * </ul>
- * <h2>Spawn hint particle</h2> Just spawn a hint. Do nothing otherwise. Useful when you want to override the hint
+ * <h3>Spawn hint particle</h3> Just spawn a hint. Do nothing otherwise. Useful when you want to override the hint
  * provided by another structure element, or as a fallback to a structure element that is check only.
  * <ul>
  * <li>{@link #ofHint(int)}, {@link #ofHintDeferred(Supplier)} and its overloads</li>
  * </ul>
  *
- * <h1>Actual Element</h1> These elements are elements that can actually do structure check, spawn hint and do auto
+ * <h2>Actual Element</h2> These elements are elements that can actually do structure check, spawn hint and do auto
  * place. Elements listed in above 2 sections are not going to be helpful without elements like these. They also serve
  * as a reference implementation for your own custom {@link IStructureElement} implementations.
- * <h2>Simple Block Element</h2> These accept one or more different block types in one location.
+ * <h3>Simple Block Element</h3> These accept one or more different block types in one location.
  * <ul>
  * <li>{@link #ofBlock(Block, int, Block, int)}, {@link #ofBlocksFlat(Map, Block, int)},
  * {@link #ofBlocksMap(Map, Block, int)} and their overloads: the most basic form</li>
@@ -98,7 +98,7 @@ import cpw.mods.fml.common.registry.GameRegistry;
  * <li>{@link #isAir()}, {@link #notAir()}: They are supplied by default under the identifier {@code '-'} and
  * {@code '+'} respectively, but are provided here regardless in case you want to use them as a fallback.</li>
  * </ul>
- * <h2>Complex Block Element</h2> In case your logic on determining which block is accepted is complex, use these.
+ * <h3>Complex Block Element</h3> In case your logic on determining which block is accepted is complex, use these.
  * <ul>
  * <li>{@link #ofBlockAdder(IBlockAdder, Block, int)}, {@link #ofBlockAdderHint(IBlockAdder, Block, int)} and their
  * overloads: hands off actual adder logic to an {@link IBlockAdder} you supplied. Save you the boilerplate of querying
@@ -110,7 +110,7 @@ import cpw.mods.fml.common.registry.GameRegistry;
  * Similar to block adder, but for tile entities.</li>
  * </ul>
  *
- * <h1>Helper Methods</h1> These don't construct a {@link IStructureElement}, but is helpful to the instantiation or
+ * <h2>Helper Methods</h2> These don't construct a {@link IStructureElement}, but is helpful to the instantiation or
  * implementation of these.
  * <ul>
  * <li>{@link #survivalPlaceBlock(Block, int, World, int, int, int, IItemSource, EntityPlayer, Consumer)} and its
@@ -595,7 +595,7 @@ public class StructureUtility {
      * <b>Example:</b>
      * <p>
      * Assume you have 16 tier, each map to one block's 16 different meta. You will usually want something like this
-     * 
+     *
      * <pre>
      * public class Tile extends TileEntity {
      *     private static final Block B = getTargetBlock();
@@ -2591,7 +2591,7 @@ public class StructureUtility {
                     // we will bypass the chatter filter here, as this is a warning that player definitively want to see
                     // instead of some false positive error messages like item not find
                     warnNoExplicitSubChannel(env.getActor());
-                return backing.survivalPlaceBlock(t, world, x, y, z, trigger, env);
+                return backing.survivalPlaceBlock(t, world, x, y, z, newTrigger, env);
             }
         };
     }

src/main/javadoc/overview.html

@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<!DOCTYPE html>
 <HTML>
 <HEAD>
     <TITLE>API Overview</TITLE>
@@ -219,7 +219,7 @@ whereas all these structure elements are designed without considering channels w
 <pre>
 import com.gtnewhorizon.structurelib.structure.IStructureElement;
 
-public class MyHatchElement&lt;T> implements IStructureElement&lt;T> {
+public class MyHatchElement&lt;T&gt; implements IStructureElement&lt;T&gt; {
     //...
    {@literal @}Override
     public PlaceResult survivalPlaceBlock(