diff --git a/src/main/java/makeo/gadomancy/common/blocks/tiles/TileBlockProtector.java b/src/main/java/makeo/gadomancy/common/blocks/tiles/TileBlockProtector.java index 7cb6219..b80aca1 100644 --- a/src/main/java/makeo/gadomancy/common/blocks/tiles/TileBlockProtector.java +++ b/src/main/java/makeo/gadomancy/common/blocks/tiles/TileBlockProtector.java @@ -1,6 +1,8 @@ package makeo.gadomancy.common.blocks.tiles; +import net.minecraft.entity.Entity; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import thaumcraft.api.ThaumcraftApiHelper; @@ -126,7 +128,12 @@ public class TileBlockProtector extends TileJarFillable { return false; } + private static boolean isSpotProtected(TileBlockProtector tile, Entity entity) { + AxisAlignedBB protectedAABB = AxisAlignedBB.getBoundingBox(tile.xCoord - tile.range, tile.yCoord - tile.range, tile.zCoord - tile.range, tile.xCoord + tile.range, tile.yCoord + tile.range, tile.zCoord + tile.range); + return protectedAABB.intersectsWith(entity.getBoundingBox()); + } + private static boolean isSpotProtected(TileBlockProtector tile, double x, double y, double z) { - return tile.getDistanceFrom(x, y, z) < tile.range * tile.range; + return (tile.xCoord - x) <= tile.range && (tile.yCoord - y) <= tile.range && (tile.zCoord - z) <= tile.range; } } diff --git a/src/main/java/makeo/gadomancy/common/registration/RegisteredResearches.java b/src/main/java/makeo/gadomancy/common/registration/RegisteredResearches.java index b628dca..7360575 100644 --- a/src/main/java/makeo/gadomancy/common/registration/RegisteredResearches.java +++ b/src/main/java/makeo/gadomancy/common/registration/RegisteredResearches.java @@ -213,6 +213,7 @@ public class RegisteredResearches { public static void postInit() { ResearchItem researchJar = PseudoResearchItem.create("JARLABEL", -3, -7).registerResearchItem(); + ResearchItem researchEssentiaMirror = PseudoResearchItem.create("MIRRORESSENTIA", -6, -2).registerResearchItem(); researchStickyJar = new AlternatingResearchItem("STICKYJAR", -5, -5, 2, new AspectList().add(Aspect.SLIME, 8).add(Aspect.EARTH, 8), @@ -223,7 +224,7 @@ public class RegisteredResearches { researchRemoteJar = new SimpleResearchItem("REMOTEJAR", -4, -3, 3, RegisteredRecipes.recipeRemoteJar.getRecipeOutput(), new AspectList().add(Aspect.WATER, 4).add(Aspect.MECHANISM, 8).add(Aspect.EARTH, 4).add(Aspect.ORDER, 8)) - .setParents(researchJar.key).setConcealed() + .setParents(researchJar.key, researchEssentiaMirror.key).setConcealed() .setPages(new ResearchPage("gadomancy.research_page.REMOTEJAR.1"), new ResearchPage(RegisteredRecipes.recipeRemoteJar), new ResearchPage("gadomancy.research_page.REMOTEJAR.2")).registerResearchItem(); } }