diff --git a/src/main/java/makeo/gadomancy/common/blocks/BlockKnowledgeBook.java b/src/main/java/makeo/gadomancy/common/blocks/BlockKnowledgeBook.java index 8b7c8d7..517c827 100644 --- a/src/main/java/makeo/gadomancy/common/blocks/BlockKnowledgeBook.java +++ b/src/main/java/makeo/gadomancy/common/blocks/BlockKnowledgeBook.java @@ -74,6 +74,9 @@ public class BlockKnowledgeBook extends BlockContainer implements IBlockTranspar if(!lower.equals(ConfigBlocks.blockStoneDevice) || metaLower != 1) { breakThisBlock(world, x, y, z); } + if(!world.isAirBlock(x, y + 1, z)) { + breakThisBlock(world, x, y, z); + } } public void breakThisBlock(World world, int x, int y, int z) { diff --git a/src/main/java/makeo/gadomancy/common/blocks/tiles/TileKnowledgeBook.java b/src/main/java/makeo/gadomancy/common/blocks/tiles/TileKnowledgeBook.java index a163993..6457bc6 100644 --- a/src/main/java/makeo/gadomancy/common/blocks/tiles/TileKnowledgeBook.java +++ b/src/main/java/makeo/gadomancy/common/blocks/tiles/TileKnowledgeBook.java @@ -47,8 +47,8 @@ public class TileKnowledgeBook extends SynchronizedTileEntity implements EntityP private static final Random rand = new Random(); private static final int LOWEST_AMOUNT = 10; - private static final int COGNITIO_TICKS = 300; - private static final int MAX_NEEDED_KNOWLEDGE = 100; + private static final int COGNITIO_TICKS = 150; + private static final int MAX_NEEDED_KNOWLEDGE = 200; private static final int SURROUNDINGS_SEARCH_XZ = 4; private static final int SURROUNDINGS_SEARCH_Y = 3; private static final double MULTIPLIER = 4; @@ -140,6 +140,9 @@ public class TileKnowledgeBook extends SynchronizedTileEntity implements EntityP } else { this.workResearchAspects.aspects.put(a, value); } + if(this.workResearchAspects.aspects.isEmpty()) { + finishResearch(); + } } private void checkSurroundings() { diff --git a/src/main/java/makeo/gadomancy/common/items/ItemBlockKnowledgeBook.java b/src/main/java/makeo/gadomancy/common/items/ItemBlockKnowledgeBook.java index 9f069c5..94975dc 100644 --- a/src/main/java/makeo/gadomancy/common/items/ItemBlockKnowledgeBook.java +++ b/src/main/java/makeo/gadomancy/common/items/ItemBlockKnowledgeBook.java @@ -35,7 +35,11 @@ public class ItemBlockKnowledgeBook extends ItemBlock { Block placedAgainst = world.getBlock(x, y, z); int againstMeta = world.getBlockMetadata(x, y, z); if(placedAgainstDir.equals(ForgeDirection.UP) && placedAgainst.equals(ConfigBlocks.blockStoneDevice) && againstMeta == 1) { - return super.onItemUse(stack, player, world, x, y, z, side, hitX, hitY, hitZ); + if(world.isAirBlock(x, y + 2, z)) { + return super.onItemUse(stack, player, world, x, y, z, side, hitX, hitY, hitZ); + } else { + return false; + } } else { return false; }