Re-enable basic crafting check, start handling field block logic

Author: robotgryphon

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

@@ -1,6 +1,7 @@
 package com.robotgryphon.compactcrafting.blocks.tiles;
 
 import com.robotgryphon.compactcrafting.blocks.FieldProjectorBlock;
+import com.robotgryphon.compactcrafting.core.BlockUpdateType;
 import com.robotgryphon.compactcrafting.field.FieldProjection;
 import com.robotgryphon.compactcrafting.field.FieldProjectionSize;
 import com.robotgryphon.compactcrafting.core.Registration;
@@ -111,11 +112,7 @@ public void tick() {
                 return;
         }
 
-        if (fieldCheckTimeout > 0) {
-            fieldCheckTimeout--;
-        } else {
-            doFieldCheck();
-        }
+        tickCrafting();
     }
 
     /**
@@ -143,15 +140,20 @@ private void tickCrafting() {
         Optional<AxisAlignedBB> fieldBounds = fp.getBounds();
 
         List<ItemEntity> enderPearls = getCatalystsInField(fieldBounds.get(), Items.ENDER_PEARL);
-
-        // We dropped an ender pearl in - are there any blocks in the field?
-        // If so, we'll need to check the recipes -- but for now we just use it to
-        // not delete the item if there's nothing in here
-        if (CraftingHelper.hasBlocksInField(world, fieldBounds.get())) {
-            CraftingHelper.deleteCraftingBlocks(world, fieldBounds.get());
-            CraftingHelper.consumeCatalystItem(enderPearls.get(0), 1);
-
-            this.isCrafting = false;
+        if(enderPearls.size() > 0) {
+            // We dropped an ender pearl in - are there any blocks in the field?
+            // If so, we'll need to check the recipes -- but for now we just use it to
+            // not delete the item if there's nothing in here
+            if (CraftingHelper.hasBlocksInField(world, fieldBounds.get())) {
+                this.isCrafting = true;
+
+                if(!world.isRemote()) {
+                    CraftingHelper.deleteCraftingBlocks(world, fieldBounds.get());
+                    CraftingHelper.consumeCatalystItem(enderPearls.get(0), 1);
+                }
+
+                this.isCrafting = false;
+            }
         }
     }
 
@@ -202,4 +204,15 @@ public AxisAlignedBB getRenderBoundingBox() {
     public Optional<FieldProjection> getField() {
         return this.field;
     }
+
+    /**
+     * Called whenever a nearby block is changed near the field.
+     * @param pos The position a block was updated at.
+     */
+    public void handleNearbyBlockUpdate(BlockPos pos, BlockUpdateType updateType) {
+        if(updateType == BlockUpdateType.UNKNOWN)
+            return;
+
+        doFieldCheck();
+    }
 }

src/main/java/com/robotgryphon/compactcrafting/core/BlockUpdateType.java

@@ -0,0 +1,7 @@
+package com.robotgryphon.compactcrafting.core;
+
+public enum BlockUpdateType {
+    PLACE,
+    REMOVE,
+    UNKNOWN
+}

src/main/java/com/robotgryphon/compactcrafting/events/EventHandler.java

@@ -0,0 +1,36 @@
+package com.robotgryphon.compactcrafting.events;
+
+import com.robotgryphon.compactcrafting.CompactCrafting;
+import com.robotgryphon.compactcrafting.core.Registration;
+import com.robotgryphon.compactcrafting.field.FieldHelper;
+import com.robotgryphon.compactcrafting.field.FieldProjectionSize;
+import net.minecraft.block.BlockState;
+import net.minecraft.block.Blocks;
+import net.minecraft.util.math.AxisAlignedBB;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.IWorld;
+import net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.eventbus.api.SubscribeEvent;
+import net.minecraftforge.fml.common.Mod;
+
+import java.util.Set;
+import java.util.stream.Collectors;
+
+@Mod.EventBusSubscriber(modid = CompactCrafting.MOD_ID)
+public class EventHandler {
+
+    @SubscribeEvent
+    public static void onBlockPlaced(final net.minecraftforge.event.world.BlockEvent.EntityPlaceEvent blockPlaced) {
+        // Check if block is in or around a projector field
+
+        IWorld world = blockPlaced.getWorld();
+        BlockPos pos = blockPlaced.getPos();
+
+        // We don't care about client worlds RN
+        if(world.isRemote())
+            return;
+
+        // Send the event position over to the field helper, so any nearby projectors can be notified
+        FieldHelper.checkBlockPlacement(world, pos);
+    }
+}

src/main/java/com/robotgryphon/compactcrafting/field/FieldHelper.java

@@ -0,0 +1,49 @@
+package com.robotgryphon.compactcrafting.field;
+
+import com.robotgryphon.compactcrafting.CompactCrafting;
+import com.robotgryphon.compactcrafting.blocks.FieldProjectorBlock;
+import com.robotgryphon.compactcrafting.blocks.tiles.FieldProjectorTile;
+import com.robotgryphon.compactcrafting.core.BlockUpdateType;
+import com.robotgryphon.compactcrafting.core.Registration;
+import net.minecraft.block.BlockState;
+import net.minecraft.util.math.AxisAlignedBB;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.IWorld;
+import net.minecraft.world.gen.blockstateprovider.BlockStateProviderType;
+
+import java.util.Set;
+import java.util.stream.Collectors;
+
+/**
+ * Provides utilities to help with projector field management.
+ */
+public abstract class FieldHelper {
+    public static void checkBlockPlacement(IWorld world, BlockPos pos) {
+        // Scan all blocks in the maximum field projection range (trying to find projectors)
+        AxisAlignedBB scanBlocks = new AxisAlignedBB(pos).grow(FieldProjectionSize.maximum().getOffset());
+
+        Set<BlockPos> projectors = BlockPos.getAllInBox(scanBlocks)
+                .filter(p -> !world.isAirBlock(p))
+                .filter(p -> {
+                    BlockState bs = world.getBlockState(p);
+                    return bs.getBlock() instanceof FieldProjectorBlock;
+                })
+                .collect(Collectors.toSet());
+
+        if(!projectors.isEmpty()) {
+            // We have projectors in the surrounding area, notify them to check their fields
+            for(BlockPos projectorPos : projectors) {
+                BlockState state = world.getBlockState(projectorPos);
+                FieldProjectorTile tile = (FieldProjectorTile) world.getTileEntity(projectorPos);
+
+                // Not a field projector tile. Somehow.
+                if(tile == null) {
+                    CompactCrafting.LOGGER.warn("Warning: Got a projector block but there was no field projector TE on the same position. Position: " + projectorPos.getCoordinatesAsString());
+                    continue;
+                }
+
+                tile.handleNearbyBlockUpdate(pos, BlockUpdateType.PLACE);
+            }
+        }
+    }
+}

src/main/java/com/robotgryphon/compactcrafting/field/FieldProjectionSize.java

@@ -42,4 +42,8 @@ public int getSize() {
     public String getName() {
         return this.name;
     }
+
+    public static FieldProjectionSize maximum() {
+        return LARGE;
+    }
 }