Merge branch 'master' of github.com:Vazkii/Botania into 1.12

This commit is contained in:
Vincent Lee committed 2017-08-07 21:11:40 -05:00
commit 1fb517ef5b
21 files changed
+19 -15

No files matched your search

@@ -10,7 +10,6 @@
*/
package vazkii.botania.common.block.decor;
import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.util.math.BlockPos;
@@ -32,11 +31,6 @@ public class BlockElfGlass extends BlockManaGlass implements IElvenItem, ILexico
return true;
}
@Override
public boolean isFullBlock(IBlockState state) {
return true;
}
@Override
public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) {
return LexiconData.elvenResources;
@@ -50,8 +50,8 @@ public class BlockManaGlass extends BlockMod implements ILexiconable {
}
@Override
public boolean isFullBlock(IBlockState state) {
return true;
public boolean isFullCube(IBlockState state) {
return false;
}
@SideOnly(Side.CLIENT)
@@ -259,7 +259,7 @@ public class EntityCorporeaSpark extends Entity implements ICorporeaSpark {
@Override
public boolean processInitialInteract(EntityPlayer player, EnumHand hand) {
ItemStack stack = player.getHeldItem(hand);
if(!stack.isEmpty()) {
if(!isDead && !stack.isEmpty()) {
if(player.world.isRemote) {
boolean valid = stack.getItem() == ModItems.twigWand || stack.getItem() == ModItems.dye || stack.getItem() == ModItems.phantomInk;
if(valid)
@@ -239,7 +239,7 @@ public class EntitySpark extends Entity implements ISparkEntity {
@Override
public boolean processInitialInteract(EntityPlayer player, EnumHand hand) {
ItemStack stack = player.getHeldItem(hand);
if(!stack.isEmpty()) {
if(!isDead && !stack.isEmpty()) {
if(world.isRemote) {
boolean valid = stack.getItem() == ModItems.twigWand || stack.getItem() == ModItems.sparkUpgrade
|| stack.getItem() == ModItems.phantomInk;