Merge branch 'jei-compat' into 1.16.x

Author: robotgryphon

.gitignore

@@ -27,3 +27,5 @@ forge*changelog.txt
 logs/
 
 mods/
+
+demo-files/

assets/jei-sprites.png

@@ -97,7 +97,7 @@ public CompoundNBT write(CompoundNBT compound) {
 
     @Override
     public SUpdateTileEntityPacket getUpdatePacket() {
-        return new SUpdateTileEntityPacket(pos, 1, getUpdateTag());
+        return new SUpdateTileEntityPacket(pos, 0, getUpdateTag());
     }
 
     @Override

src/main/java/com/robotgryphon/compactcrafting/blocks/FieldCraftingPreviewTile.java

@@ -215,7 +215,7 @@ public void doRecipeScan() {
         // If there are no registered recipes, then we obv can't match anything - exit early
         if (entries.isEmpty()) {
             this.currentRecipe = null;
-            this.craftingState = EnumCraftingState.NOT_MATCHED;
+            updateCraftingState(EnumCraftingState.NOT_MATCHED);
             return;
         }
 
@@ -226,7 +226,7 @@ public void doRecipeScan() {
         // If no positions filled, exit early
         if (fieldBlocks.getNumberFilledBlocks() == 0) {
             this.currentRecipe = null;
-            this.craftingState = EnumCraftingState.NOT_MATCHED;
+            updateCraftingState(EnumCraftingState.NOT_MATCHED);
             return;
         }
 
@@ -242,7 +242,7 @@ public void doRecipeScan() {
         // blocks were placed in a larger space than the max recipe size
         if (recipesBoundFitted.size() == 0) {
             this.currentRecipe = null;
-            this.craftingState = EnumCraftingState.NOT_MATCHED;
+            updateCraftingState(EnumCraftingState.NOT_MATCHED);
             return;
         }
 
@@ -254,7 +254,7 @@ public void doRecipeScan() {
                 continue;
 
             matchedRecipe = recipe;
-            this.craftingState = EnumCraftingState.MATCHED;
+            updateCraftingState(EnumCraftingState.MATCHED);
             break;
         }
 
@@ -277,7 +277,7 @@ private void tickCrafting() {
                 // Start crafting
                 switch (craftingState) {
                     case MATCHED:
-                        craftingState = EnumCraftingState.CRAFTING;
+                        updateCraftingState(EnumCraftingState.CRAFTING);
 
                         // We know the "recipe" in the field is an exact match already, so wipe the field
                         field.clearBlocks(world);
@@ -297,7 +297,7 @@ private void tickCrafting() {
 
                     case DONE:
                         // We aren't crafting any more - recipe complete, reset for next one
-                        this.craftingState = EnumCraftingState.NOT_MATCHED;
+                        updateCraftingState(EnumCraftingState.NOT_MATCHED);
                         this.currentRecipe = null;
                         break;
                 }
@@ -354,6 +354,9 @@ public Optional<MiniaturizationRecipe> getCurrentRecipe() {
 
     public void updateCraftingState(EnumCraftingState state) {
         this.craftingState = state;
-        this.markDirty();
+    }
+
+    public EnumCraftingState getCraftingState() {
+        return this.craftingState;
     }
 }

src/main/java/com/robotgryphon/compactcrafting/blocks/FieldProjectorTile.java

@@ -11,6 +11,7 @@
 import net.minecraft.client.renderer.tileentity.TileEntityRenderer;
 import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher;
 import net.minecraft.util.math.AxisAlignedBB;
+import net.minecraft.util.math.vector.Vector3f;
 import net.minecraftforge.client.model.data.EmptyModelData;
 
 import java.util.Optional;
@@ -33,16 +34,16 @@ public void render(FieldCraftingPreviewTile tile, float partialTicks, MatrixStac
             mx.translate(0.5, 0.5, 0.5);
 
             // progress, ticks required
-            double craftProgress = (double) tile.getProgress();
-            double progress = 1.0d - (craftProgress / (double) 200);
+            double craftProgress = tile.getProgress();
+
+            double progress = 1.0d - (craftProgress / (double)rec.getTicks());
 
             double scale = progress * (1.0f - ((Math.sin(Math.toDegrees(RenderTickCounter.renderTicks) / 2000) + 1.0f) * 0.1f));
-            scale *= 0.7d;
 
             mx.scale((float) scale, (float) scale, (float) scale);
 
-            // double yaw = Math.sin(Math.toDegrees(RenderTickCounter.renderTicks) / FieldProjectorRenderer.RotationSpeed.SLOW.getSpeed()) * 10;
-            // mx.rotate(Vector3f.YP.rotation((float) yaw));
+            double angle = RenderTickCounter.renderTicks * (45.0f / 64.0f);
+            mx.rotate(Vector3f.YP.rotationDegrees((float) angle));
 
             AxisAlignedBB dimensions = rec.getDimensions();
             mx.translate(-(dimensions.getXSize() / 2), -(dimensions.getYSize() / 2), -(dimensions.getZSize() / 2));

src/main/java/com/robotgryphon/compactcrafting/client/render/FieldCraftingPreviewRenderer.java

@@ -2,10 +2,12 @@
 
 import com.mojang.blaze3d.matrix.MatrixStack;
 import com.mojang.blaze3d.vertex.IVertexBuilder;
+import com.robotgryphon.compactcrafting.blocks.FieldCraftingPreviewTile;
 import com.robotgryphon.compactcrafting.blocks.FieldProjectorBlock;
 import com.robotgryphon.compactcrafting.blocks.FieldProjectorTile;
 import com.robotgryphon.compactcrafting.core.Constants;
 import com.robotgryphon.compactcrafting.core.EnumProjectorColorType;
+import com.robotgryphon.compactcrafting.crafting.EnumCraftingState;
 import com.robotgryphon.compactcrafting.field.FieldProjection;
 import net.minecraft.block.BlockState;
 import net.minecraft.client.Minecraft;
@@ -64,16 +66,43 @@ public void render(FieldProjectorTile tile, float partialTicks, MatrixStack matr
             BlockPos center = fp.getCenterPosition();
             int fieldSize = fp.getFieldSize().getSize();
 
+            float scale = 1f;
+
+
+
             AxisAlignedBB cube = fp.getBounds();
 
-            renderFaces(tile, matrixStack, buffers, cube, 0);
+            // renderFaces(tile, matrixStack, buffers, cube, 0);
 
             // TODO - WIP ARC CODE
             // drawProjectorArcs(tile, matrixStack, buffers, cube, fieldSize);
 
             if (tile.isMainProjector()) {
+                EnumCraftingState state = tile.getCraftingState();
+                if(state == EnumCraftingState.CRAFTING) {
+                    FieldCraftingPreviewTile preview = (FieldCraftingPreviewTile) tile
+                            .getWorld()
+                            .getTileEntity(fp.getCenterPosition());
+
+                    // No preview tile found, not actually crafting rn
+                    if(preview == null)
+                        return;
+
+                    double craftProgress = preview.getProgress();
+
+                    double progress = 1.0d - (craftProgress / (double) tile.getCurrentRecipe().get().getTicks());
+
+                    scale = (float) (progress * (1.0f - ((Math.sin(Math.toDegrees(RenderTickCounter.renderTicks) / 2000) + 1.0f) * 0.1f)));
+                }
+
+                matrixStack.push();
+
+                matrixStack.scale(scale, scale, scale);
+
                 drawScanLines(tile, matrixStack, buffers, cube, fieldSize);
                 renderProjectionCube(tile, matrixStack, buffers, cube, fieldSize);
+
+                matrixStack.pop();
             }
         }
     }

src/main/java/com/robotgryphon/compactcrafting/client/render/FieldProjectorRenderer.java

@@ -2,6 +2,8 @@
 
 import com.mojang.blaze3d.platform.GlStateManager;
 import com.mojang.blaze3d.systems.RenderSystem;
+import com.robotgryphon.compactcrafting.CompactCrafting;
+import net.minecraft.client.renderer.IRenderTypeBuffer;
 import net.minecraft.client.renderer.RenderState;
 import net.minecraft.client.renderer.RenderType;
 import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
@@ -44,4 +46,53 @@ public RenderTypesExtensions(String name, VertexFormat format, int p_i225992_3_,
                     .writeMask(COLOR_WRITE)
                     .depthTest(DepthTestState.DEPTH_LEQUAL) // Default, but let's make sure it stays that way
                     .build(false));
+
+    public static final RenderType MULTIBLOCK_GUI = makeType(CompactCrafting.MOD_ID + ":multiblock_gui",
+            DefaultVertexFormats.BLOCK, GL11.GL_QUADS, 256,
+            RenderType.State.getBuilder()
+                    .transparency(PROJECTION_TRANSPARENCY)
+                    .target(RenderState.MAIN_TARGET)
+                    .cull(RenderState.CULL_ENABLED)
+                    .writeMask(RenderState.COLOR_WRITE)
+                    .diffuseLighting(DiffuseLightingState.DIFFUSE_LIGHTING_DISABLED)
+                    .depthTest(DepthTestState.DEPTH_LEQUAL)
+                    .build(false));
+
+    public static IRenderTypeBuffer disableLighting(IRenderTypeBuffer in)
+    {
+        return wrapWithAdditional(
+                in,
+                "no_lighting",
+                RenderSystem::disableLighting,
+                () -> {
+                }
+        );
+    }
+
+    private static IRenderTypeBuffer wrapWithAdditional(
+            IRenderTypeBuffer in,
+            String name,
+            Runnable setup,
+            Runnable teardown
+    )
+    {
+        return type -> in.getBuffer(new RenderType(
+                CompactCrafting.MOD_ID+":"+type+"_"+name,
+                type.getVertexFormat(),
+                type.getDrawMode(),
+                type.getBufferSize(),
+                type.isUseDelegate(),
+                false, // needsSorting is private and shouldn't be too relevant here
+                () -> {
+                    type.setupRenderState();
+                    setup.run();
+                },
+                () -> {
+                    teardown.run();
+                    type.clearRenderState();
+                }
+        )
+        {
+        });
+    }
 }