Move IManaCollisionGhost to blocks. Closes #280

This commit is contained in:
Vincent Lee committed 2016-05-18 19:16:51 -05:00
1 parent 056f46b1f8
commit bdf51cbc8b
11 files changed
+46 -41

No files matched your search

@@ -10,12 +10,16 @@
*/
package vazkii.botania.api.mana;
import net.minecraft.block.state.IBlockState;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
/**
* Any TileEntity that implements this can be counted as a "ghost" block of
* Any Block 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();
public boolean isGhost(IBlockState state, World world, BlockPos pos);
}
@@ -1,4 +1,4 @@
@API(owner = "Botania", apiVersion = "78", provides = "BotaniaAPI")
@API(owner = "Botania", apiVersion = "79", provides = "BotaniaAPI")
package vazkii.botania.api;
import net.minecraftforge.fml.common.API;
@@ -33,6 +33,7 @@ import net.minecraftforge.common.property.IUnlistedProperty;
import net.minecraftforge.fml.common.registry.GameRegistry;
import vazkii.botania.api.lexicon.ILexiconable;
import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.api.mana.IManaCollisionGhost;
import vazkii.botania.api.state.BotaniaStateProps;
import vazkii.botania.api.state.enums.PlatformVariant;
import vazkii.botania.api.wand.IWandable;
@@ -44,7 +45,7 @@ import vazkii.botania.common.lib.LibBlockNames;
import java.util.List;
public class BlockPlatform extends BlockCamo implements ILexiconable, IWandable {
public class BlockPlatform extends BlockCamo implements ILexiconable, IWandable, IManaCollisionGhost {
public BlockPlatform() {
super(Material.WOOD, LibBlockNames.PLATFORM);
@@ -142,4 +143,8 @@ public class BlockPlatform extends BlockCamo implements ILexiconable, IWandable
return tile.onWanded(player);
}
@Override
public boolean isGhost(IBlockState state, World world, BlockPos pos) {
return true;
}
}
@@ -22,11 +22,12 @@ import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import vazkii.botania.api.lexicon.ILexiconable;
import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.api.mana.IManaCollisionGhost;
import vazkii.botania.common.block.tile.TileTinyPlanet;
import vazkii.botania.common.lexicon.LexiconData;
import vazkii.botania.common.lib.LibBlockNames;
public class BlockTinyPlanet extends BlockMod implements ILexiconable {
public class BlockTinyPlanet extends BlockMod implements ILexiconable, IManaCollisionGhost {
private static final AxisAlignedBB AABB = new AxisAlignedBB(3.0/16, 3.0/16, 3.0/16, 13.0/16, 13.0/16, 13.0/16);
@@ -67,4 +68,8 @@ public class BlockTinyPlanet extends BlockMod implements ILexiconable {
return LexiconData.tinyPlanet;
}
@Override
public boolean isGhost(IBlockState state, World world, BlockPos pos) {
return true;
}
}
@@ -26,6 +26,7 @@ import net.minecraft.world.World;
import vazkii.botania.api.internal.IManaBurst;
import vazkii.botania.api.lexicon.ILexiconable;
import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.api.mana.IManaCollisionGhost;
import vazkii.botania.api.state.BotaniaStateProps;
import vazkii.botania.common.block.BlockMod;
import vazkii.botania.common.block.tile.mana.TileManaDetector;
@@ -34,7 +35,7 @@ import vazkii.botania.common.lib.LibBlockNames;
import java.util.List;
public class BlockManaDetector extends BlockMod implements ILexiconable {
public class BlockManaDetector extends BlockMod implements ILexiconable, IManaCollisionGhost {
public BlockManaDetector() {
super(Material.ROCK, LibBlockNames.MANA_DETECTOR);
@@ -90,4 +91,8 @@ public class BlockManaDetector extends BlockMod implements ILexiconable {
return LexiconData.manaDetector;
}
@Override
public boolean isGhost(IBlockState state, World world, BlockPos pos) {
return true;
}
}
@@ -33,6 +33,7 @@ import vazkii.botania.api.internal.IManaBurst;
import vazkii.botania.api.lexicon.ILexiconable;
import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.api.mana.ILens;
import vazkii.botania.api.mana.IManaCollisionGhost;
import vazkii.botania.api.mana.IManaTrigger;
import vazkii.botania.api.state.BotaniaStateProps;
import vazkii.botania.common.block.BlockMod;
@@ -43,7 +44,7 @@ import vazkii.botania.common.lib.LibBlockNames;
import java.util.Random;
public class BlockPrism extends BlockMod implements IManaTrigger, ILexiconable {
public class BlockPrism extends BlockMod implements IManaTrigger, ILexiconable, IManaCollisionGhost {
private static final AxisAlignedBB AABB = new AxisAlignedBB(0.25, 0, 0.25, 0.75, 1, 0.75);
@@ -209,4 +210,8 @@ public class BlockPrism extends BlockMod implements IManaTrigger, ILexiconable {
return LexiconData.prism;
}
@Override
public boolean isGhost(IBlockState state, World world, BlockPos pos) {
return true;
}
}
@@ -16,12 +16,7 @@ import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.BlockPos;
import vazkii.botania.api.mana.IManaCollisionGhost;
public class TilePlatform extends TileCamo implements IManaCollisionGhost {
@Override
public boolean isGhost() {
return true;
}
public class TilePlatform extends TileCamo {
public boolean onWanded(EntityPlayer player) {
if(player != null) {
@@ -13,16 +13,11 @@ package vazkii.botania.common.block.tile;
import vazkii.botania.api.mana.IManaCollisionGhost;
import vazkii.botania.common.item.equipment.bauble.ItemTinyPlanet;
public class TileTinyPlanet extends TileMod implements IManaCollisionGhost {
public class TileTinyPlanet extends TileMod {
@Override
public void updateEntity() {
ItemTinyPlanet.applyEffect(worldObj, pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5);
}
@Override
public boolean isGhost() {
return true;
}
}
@@ -19,7 +19,7 @@ import vazkii.botania.api.state.BotaniaStateProps;
import vazkii.botania.common.Botania;
import vazkii.botania.common.block.tile.TileMod;
public class TileManaDetector extends TileMod implements IManaCollisionGhost {
public class TileManaDetector extends TileMod {
@Override
public void updateEntity() {
@@ -33,9 +33,4 @@ public class TileManaDetector extends TileMod implements IManaCollisionGhost {
Botania.proxy.sparkleFX(getWorld(), pos.getX() + Math.random(), pos.getY() + Math.random(), pos.getZ() + Math.random(), 1F, 0.2F, 0.2F, 0.7F + 0.5F * (float) Math.random(), 5);
}
@Override
public boolean isGhost() {
return true;
}
}
@@ -21,7 +21,7 @@ import vazkii.botania.api.mana.ITinyPlanetExcempt;
import vazkii.botania.api.state.BotaniaStateProps;
import vazkii.botania.common.block.tile.TileSimpleInventory;
public class TilePrism extends TileSimpleInventory implements IManaCollisionGhost {
public class TilePrism extends TileSimpleInventory {
public void onBurstCollision(IManaBurst burst) {
ItemStack lens = itemHandler.getStackInSlot(0);
@@ -49,11 +49,6 @@ public class TilePrism extends TileSimpleInventory implements IManaCollisionGhos
}
}
@Override
public boolean isGhost() {
return true;
}
@Override
public int getSizeInventory() {
return 1;
@@ -377,15 +377,16 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst {
}
@Override
protected void onImpact(RayTraceResult RayTraceResult) {
protected void onImpact(RayTraceResult rtr) {
boolean collided = false;
boolean dead = false;
if(RayTraceResult.entityHit == null) {
TileEntity tile = worldObj.getTileEntity(RayTraceResult.getBlockPos());
Block block = worldObj.getBlockState(RayTraceResult.getBlockPos()).getBlock();
if(rtr.entityHit == null) {
TileEntity tile = worldObj.getTileEntity(rtr.getBlockPos());
IBlockState state = worldObj.getBlockState(rtr.getBlockPos());
Block block = state.getBlock();
if(tile instanceof IManaCollisionGhost && ((IManaCollisionGhost) tile).isGhost() && !(block instanceof IManaTrigger) || block instanceof BlockBush || block instanceof BlockLeaves)
if(block instanceof IManaCollisionGhost && ((IManaCollisionGhost) block).isGhost(state, worldObj, rtr.getBlockPos()) && !(block instanceof IManaTrigger) || block instanceof BlockBush || block instanceof BlockLeaves)
return;
if(BotaniaAPI.internalHandler.isBuildcraftPipe(tile))
@@ -400,9 +401,9 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst {
onRecieverImpact((IManaReceiver) tile, tile.getPos());
if(block instanceof IManaTrigger)
((IManaTrigger) block).onBurstCollision(this, worldObj, RayTraceResult.getBlockPos());
((IManaTrigger) block).onBurstCollision(this, worldObj, rtr.getBlockPos());
boolean ghost = tile instanceof IManaCollisionGhost;
boolean ghost = block instanceof IManaCollisionGhost;
dead = !ghost;
if(ghost)
return;
@@ -413,10 +414,10 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst {
ILensEffect lens = getLensInstance();
if(lens != null)
dead = lens.collideBurst(this, RayTraceResult, collidedTile != null && collidedTile instanceof IManaReceiver && ((IManaReceiver) collidedTile).canRecieveManaFromBursts(), dead, getSourceLens());
dead = lens.collideBurst(this, rtr, collidedTile != null && collidedTile instanceof IManaReceiver && ((IManaReceiver) collidedTile).canRecieveManaFromBursts(), dead, getSourceLens());
if(collided && !hasAlreadyCollidedAt(RayTraceResult.getBlockPos()))
alreadyCollidedAt.add(RayTraceResult.getBlockPos());
if(collided && !hasAlreadyCollidedAt(rtr.getBlockPos()))
alreadyCollidedAt.add(rtr.getBlockPos());
if(dead && !isDead) {
if(!fake) {