Improve field catalyst detection, fix issue with field rendering

- Improves catalyst detection that the field does not spawn particles if it's an air block
- Updates catalyst code that field will not consume catalyst if no blocks are in field
- Slightly improves catalyst count logic
- Changes projector rendering to increase field of view and center on the crafting field, instead of the projectors themselves

Author: robotgryphon

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

@@ -18,11 +18,14 @@
 import net.minecraft.util.Direction;
 import net.minecraft.util.math.AxisAlignedBB;
 import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.vector.Vector3d;
 import net.minecraft.util.math.vector.Vector3f;
+import net.minecraft.util.math.vector.Vector3i;
 import net.minecraftforge.items.ItemHandlerHelper;
 
 import java.util.List;
 import java.util.Optional;
+import java.util.stream.Collectors;
 
 public class FieldProjectorTile extends TileEntity implements ITickableTileEntity {
 
@@ -99,42 +102,75 @@ public void tick() {
         if (!isMainProjector())
             return;
 
-        // TODO: Check crafting state of projection field, update that state instead of doing manual work here
-        searchForCatalyst();
+        Optional<AxisAlignedBB> fieldBounds = getFieldBounds();
+        if(fieldBounds.isPresent()) {
+            // TODO: Check crafting state of projection field, update that state instead of doing manual work here
+            boolean hasCatalyst = hasCatalystInBounds(fieldBounds.get(), Items.ENDER_PEARL);
+
+            if(hasCatalyst) {
+                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.consumeCatalystItem(enderPearls.get(0), 1);
+                    CraftingHelper.deleteCraftingBlocks(world, fieldBounds.get());
+                }
+            }
+        }
     }
 
-    private void searchForCatalyst() {
+    private Optional<AxisAlignedBB> getFieldBounds() {
         Optional<BlockPos> center = getCenter();
 
         // No center area - no other projector present
         if (!center.isPresent())
-            return;
+            return Optional.empty();
 
         BlockPos centerPos = center.get();
         FieldProjectionSize size = getProjectionSize();
-        AxisAlignedBB itemSuckBounds = new AxisAlignedBB(centerPos).grow(size.getSize());
+        AxisAlignedBB bounds = new AxisAlignedBB(centerPos).grow(size.getSize());
 
+        return Optional.of(bounds);
+    }
+
+    private List<ItemEntity> getCatalystsInField(AxisAlignedBB fieldBounds, Item itemFilter) {
+        List<ItemEntity> itemsInRange = world.getEntitiesWithinAABB(ItemEntity.class, fieldBounds);
+        return itemsInRange.stream()
+                .filter(ise -> ise.getItem().getItem() == itemFilter)
+                .collect(Collectors.toList());
+    }
+
+    private boolean hasCatalystInBounds(AxisAlignedBB bounds, Item itemFilter) {
         try {
-            List<ItemEntity> itemsInRange = world.getEntitiesWithinAABB(ItemEntity.class, itemSuckBounds);
-            collectItems(centerPos, itemsInRange);
+            List<ItemEntity> itemsInRange = getCatalystsInField(bounds, itemFilter);
+            int matchedCatalysts = collectItems(itemsInRange);
+
+            return matchedCatalysts > 0;
         } catch (NullPointerException npe) {
 
         }
-    }
 
-    private void collectItems(BlockPos center, List<ItemEntity> itemsInRange) {
-        itemsInRange.forEach(item -> {
-            if (item.getItem().getItem() == Items.ENDER_PEARL) {
+        return false;
+    }
 
-                boolean consumedCatalyst = CraftingHelper.consumeCatalystItem(item, 1);
+    private int collectItems(List<ItemEntity> itemsInRange) {
+        return itemsInRange.stream()
+                // .filter(ise -> ise.getItem().getItem() == item)
+                .map(ItemEntity::getItem)
+                .map(ItemStack::getCount)
+                .mapToInt(Integer::intValue)
+                .sum();
+    }
 
-                if(consumedCatalyst) {
-                    PlayerEntity closestPlayer = world.getClosestPlayer(center.getX(), center.getY(), center.getZ(), 5, false);
+    @Override
+    public AxisAlignedBB getRenderBoundingBox() {
+        Optional<AxisAlignedBB> field = this.getFieldBounds();
+        if(field.isPresent()) {
+            return field.get().grow(10);
+        }
 
-                    ItemStack output = new ItemStack(Items.DIAMOND, 1);
-                    closestPlayer.addItemStackToInventory(output);
-                }
-            }
-        });
+        return super.getRenderBoundingBox();
     }
 }

src/main/java/com/robotgryphon/compactcrafting/crafting/CraftingHelper.java

@@ -12,14 +12,21 @@
 
 public abstract class CraftingHelper {
 
+    public static boolean hasBlocksInField(IWorld world, AxisAlignedBB area) {
+        // Remove blocks from the world
+        return BlockPos.getAllInBox(area)
+                .anyMatch(p -> !world.isAirBlock(p));
+    }
+
     public static void deleteCraftingBlocks(IWorld world, AxisAlignedBB area) {
         // Remove blocks from the world
         BlockPos.getAllInBox(area)
+                .filter(pos -> !world.isAirBlock(pos))
                 .forEach(blockPos -> {
-                    world.destroyBlock(blockPos, false);
-                    world.addParticle(ParticleTypes.LARGE_SMOKE,
-                            blockPos.getX() + 0.5f, blockPos.getY() + 0.5f, blockPos.getZ() + 0.5f,
-                            10.0d, 0.5D, 0.5D);
+                        world.destroyBlock(blockPos, false);
+                        world.addParticle(ParticleTypes.LARGE_SMOKE,
+                                blockPos.getX() + 0.5f, blockPos.getY() + 0.5f, blockPos.getZ() + 0.5f,
+                                0d, 0.05D, 0D);
                 });
     }