diff --git a/MODSRC/vazkii/botania/api/mana/IManaCollisionGhost.java b/MODSRC/vazkii/botania/api/mana/IManaCollisionGhost.java new file mode 100644 index 000000000..b5f253f8f --- /dev/null +++ b/MODSRC/vazkii/botania/api/mana/IManaCollisionGhost.java @@ -0,0 +1,22 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under a + * Creative Commons Attribution-NonCommercial-ShareAlike 3.0 License + * (http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_GB) + * + * File Created @ [Mar 10, 2014, 7:49:19 PM (GMT)] + */ +package vazkii.botania.api.mana; + +/** + * Any TileEntity that implements this can be counted as a "ghost" block of + * sorts, that won't call the collision code for the mana bursts. + */ +public interface IManaCollisionGhost { + + public boolean isGhost(); + +} diff --git a/MODSRC/vazkii/botania/common/block/BlockManaDetector.java b/MODSRC/vazkii/botania/common/block/BlockManaDetector.java new file mode 100644 index 000000000..0125944d5 --- /dev/null +++ b/MODSRC/vazkii/botania/common/block/BlockManaDetector.java @@ -0,0 +1,64 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under a + * Creative Commons Attribution-NonCommercial-ShareAlike 3.0 License + * (http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_GB) + * + * File Created @ [Mar 10, 2014, 7:57:38 PM (GMT)] + */ +package vazkii.botania.common.block; + +import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.Icon; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; +import vazkii.botania.client.core.helper.IconHelper; +import vazkii.botania.common.block.tile.TileManaDetector; +import vazkii.botania.common.lib.LibBlockIDs; +import vazkii.botania.common.lib.LibBlockNames; + +public class BlockManaDetector extends BlockModContainer { + + Icon[] icons; + + protected BlockManaDetector() { + super(LibBlockIDs.idManaDetector, Material.rock); + setHardness(2.0F); + setResistance(10.0F); + setStepSound(soundStoneFootstep); + setUnlocalizedName(LibBlockNames.MANA_DETECTOR); + } + + @Override + public void registerIcons(IconRegister par1IconRegister) { + icons = new Icon[2]; + for(int i = 0; i < icons.length; i++) + icons[i] = IconHelper.forBlock(par1IconRegister, this, i); + } + + @Override + public Icon getIcon(int par1, int par2) { + return icons[Math.min(icons.length - 1, par2)]; + } + + @Override + public boolean canProvidePower() { + return true; + } + + @Override + public int isProvidingWeakPower(IBlockAccess par1iBlockAccess, int par2, int par3, int par4, int par5) { + return par1iBlockAccess.getBlockMetadata(par2, par3, par4) != 0 ? 15 : 0; + } + + @Override + public TileEntity createNewTileEntity(World world) { + return new TileManaDetector(); + } + +} diff --git a/MODSRC/vazkii/botania/common/block/ModBlocks.java b/MODSRC/vazkii/botania/common/block/ModBlocks.java index 048d9ac1b..dd5b86c11 100644 --- a/MODSRC/vazkii/botania/common/block/ModBlocks.java +++ b/MODSRC/vazkii/botania/common/block/ModBlocks.java @@ -26,6 +26,7 @@ import vazkii.botania.common.block.subtile.generating.SubTileHydroangeas; import vazkii.botania.common.block.tile.TileAltar; import vazkii.botania.common.block.tile.TileDistributor; import vazkii.botania.common.block.tile.TileManaBeacon; +import vazkii.botania.common.block.tile.TileManaDetector; import vazkii.botania.common.block.tile.TileManaVoid; import vazkii.botania.common.block.tile.TilePool; import vazkii.botania.common.block.tile.TilePylon; @@ -53,6 +54,7 @@ public final class ModBlocks { public static Block distributor; public static Block manaBeacon; public static Block manaVoid; + public static Block manaDetector; public static void init() { flower = new BlockModFlower(); @@ -69,6 +71,7 @@ public final class ModBlocks { distributor = new BlockDistributor(); manaBeacon = new BlockManaBeacon(); manaVoid = new BlockManaVoid(); + manaDetector = new BlockManaDetector(); for(int i = 0; i < 16; i++) OreDictionary.registerOre(LibOreDict.FLOWER[i], new ItemStack(flower.blockID, 1, i)); @@ -90,6 +93,7 @@ public final class ModBlocks { GameRegistry.registerTileEntity(TileDistributor.class, LibBlockNames.DISTRIBUTOR); GameRegistry.registerTileEntity(TileManaBeacon.class, LibBlockNames.MANA_BEACON); GameRegistry.registerTileEntity(TileManaVoid.class, LibBlockNames.MANA_VOID); + GameRegistry.registerTileEntity(TileManaDetector.class, LibBlockNames.MANA_DETECTOR); BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_PUREDAISY, SubTilePureDaisy.class); diff --git a/MODSRC/vazkii/botania/common/block/tile/TileManaDetector.java b/MODSRC/vazkii/botania/common/block/tile/TileManaDetector.java new file mode 100644 index 000000000..5146f5e21 --- /dev/null +++ b/MODSRC/vazkii/botania/common/block/tile/TileManaDetector.java @@ -0,0 +1,35 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under a + * Creative Commons Attribution-NonCommercial-ShareAlike 3.0 License + * (http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_GB) + * + * File Created @ [Mar 10, 2014, 7:55:12 PM (GMT)] + */ +package vazkii.botania.common.block.tile; + +import net.minecraft.util.AxisAlignedBB; +import vazkii.botania.api.internal.IManaBurst; +import vazkii.botania.api.mana.IManaCollisionGhost; + +public class TileManaDetector extends TileMod implements IManaCollisionGhost { + + @Override + public void updateEntity() { + if(!worldObj.isRemote) { + int meta = getBlockMetadata(); + int expectedMeta = worldObj.getEntitiesWithinAABB(IManaBurst.class, AxisAlignedBB.getBoundingBox(xCoord, yCoord, zCoord, xCoord + 1, yCoord + 1, zCoord + 1)).size() != 0 ? 1 : 0; + if(meta != expectedMeta) + worldObj.setBlockMetadataWithNotify(xCoord, yCoord, zCoord, expectedMeta, 1 | 2); + } + } + + @Override + public boolean isGhost() { + return true; + } + +} diff --git a/MODSRC/vazkii/botania/common/core/handler/ConfigHandler.java b/MODSRC/vazkii/botania/common/core/handler/ConfigHandler.java index d3ac2c560..db83c073b 100644 --- a/MODSRC/vazkii/botania/common/core/handler/ConfigHandler.java +++ b/MODSRC/vazkii/botania/common/core/handler/ConfigHandler.java @@ -60,6 +60,7 @@ public final class ConfigHandler { LibBlockIDs.idDistributor = loadBlock(LibBlockNames.DISTRIBUTOR, LibBlockIDs.idDistributor); LibBlockIDs.idManaBeacon = loadBlock(LibBlockNames.MANA_BEACON, LibBlockIDs.idManaBeacon); LibBlockIDs.idManaVoid = loadBlock(LibBlockNames.MANA_VOID, LibBlockIDs.idManaVoid); + LibBlockIDs.idManaDetector = loadBlock(LibBlockNames.MANA_DETECTOR, LibBlockIDs.idManaDetector); // Item IDs LibItemIDs.idLexicon = loadItem(LibItemNames.LEXICON, LibItemIDs.idLexicon); diff --git a/MODSRC/vazkii/botania/common/entity/EntityManaBurst.java b/MODSRC/vazkii/botania/common/entity/EntityManaBurst.java index b09617b76..9e6013aba 100644 --- a/MODSRC/vazkii/botania/common/entity/EntityManaBurst.java +++ b/MODSRC/vazkii/botania/common/entity/EntityManaBurst.java @@ -31,6 +31,7 @@ import net.minecraft.world.World; import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.api.mana.ILens; import vazkii.botania.api.mana.IManaCollector; +import vazkii.botania.api.mana.IManaCollisionGhost; import vazkii.botania.api.mana.IManaReceiver; import vazkii.botania.common.Botania; import vazkii.botania.common.block.tile.TileSpreader; @@ -461,6 +462,9 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { if(movingobjectposition.entityHit == null) { TileEntity tile = worldObj.getBlockTileEntity(movingobjectposition.blockX, movingobjectposition.blockY, movingobjectposition.blockZ); + if(tile instanceof IManaCollisionGhost && ((IManaCollisionGhost) tile).isGhost()) + return; + ChunkCoordinates coords = getBurstSourceChunkCoordinates(); if(tile != null && (tile.xCoord != coords.posX || tile.yCoord != coords.posY || tile.zCoord != coords.posZ)) collidedTile = tile; diff --git a/MODSRC/vazkii/botania/common/lib/LibBlockIDs.java b/MODSRC/vazkii/botania/common/lib/LibBlockIDs.java index 922673513..8199a3bae 100644 --- a/MODSRC/vazkii/botania/common/lib/LibBlockIDs.java +++ b/MODSRC/vazkii/botania/common/lib/LibBlockIDs.java @@ -27,5 +27,6 @@ public final class LibBlockIDs { public static int idDistributor = 1966; public static int idManaBeacon = 1967; public static int idManaVoid = 1968; + public static int idManaDetector = 1969; } diff --git a/MODSRC/vazkii/botania/common/lib/LibBlockNames.java b/MODSRC/vazkii/botania/common/lib/LibBlockNames.java index 98a0dc6ef..7932f16dc 100644 --- a/MODSRC/vazkii/botania/common/lib/LibBlockNames.java +++ b/MODSRC/vazkii/botania/common/lib/LibBlockNames.java @@ -29,6 +29,7 @@ public final class LibBlockNames { public static final String DISTRIBUTOR = LibResources.PREFIX_MOD + "distributor"; public static final String MANA_BEACON = LibResources.PREFIX_MOD + "manaBeacon"; public static final String MANA_VOID = LibResources.PREFIX_MOD + "manaVoid"; + public static final String MANA_DETECTOR = LibResources.PREFIX_MOD + "manaDetector"; public static final String SPECIAL_FLOWER_PREFIX = FLOWER + "."; diff --git a/resources/assets/botania/lang/en_US.lang b/resources/assets/botania/lang/en_US.lang index ce32d5d89..b3738f3af 100644 --- a/resources/assets/botania/lang/en_US.lang +++ b/resources/assets/botania/lang/en_US.lang @@ -103,6 +103,7 @@ tile.botania:manaBeacon13.name=Green Unstable Beacon tile.botania:manaBeacon14.name=Red Unstable Beacon tile.botania:manaBeacon15.name=Black Unstable Beacon tile.botania:manaVoid.name=Mana Void +tile.botania:manaDetector.name=Mana Detector # FLOWER NAMES tile.botania:flower..name=Botania Flower diff --git a/resources/assets/botania/textures/blocks/manaDetector0.png b/resources/assets/botania/textures/blocks/manaDetector0.png new file mode 100644 index 000000000..cc9660f9d Binary files /dev/null and b/resources/assets/botania/textures/blocks/manaDetector0.png differ diff --git a/resources/assets/botania/textures/blocks/manaDetector1.png b/resources/assets/botania/textures/blocks/manaDetector1.png new file mode 100644 index 000000000..b660b0991 Binary files /dev/null and b/resources/assets/botania/textures/blocks/manaDetector1.png differ