Merge pull request #1279 from GirafiStudios/BOP-1.12.x-7.0.x
Various misc fixes
This commit is contained in:
commit
9d9e912766
|
@ -8,12 +8,6 @@
|
||||||
|
|
||||||
package biomesoplenty.common.block;
|
package biomesoplenty.common.block;
|
||||||
|
|
||||||
import java.util.Random;
|
|
||||||
|
|
||||||
import javax.annotation.Nullable;
|
|
||||||
|
|
||||||
import biomesoplenty.api.block.BOPBlocks;
|
|
||||||
import biomesoplenty.api.enums.BOPPlants;
|
|
||||||
import biomesoplenty.api.item.BOPItems;
|
import biomesoplenty.api.item.BOPItems;
|
||||||
import biomesoplenty.api.particle.BOPParticleTypes;
|
import biomesoplenty.api.particle.BOPParticleTypes;
|
||||||
import biomesoplenty.api.potion.BOPPotions;
|
import biomesoplenty.api.potion.BOPPotions;
|
||||||
|
@ -32,14 +26,11 @@ import net.minecraft.client.renderer.color.IItemColor;
|
||||||
import net.minecraft.entity.Entity;
|
import net.minecraft.entity.Entity;
|
||||||
import net.minecraft.entity.EntityLivingBase;
|
import net.minecraft.entity.EntityLivingBase;
|
||||||
import net.minecraft.entity.player.EntityPlayer;
|
import net.minecraft.entity.player.EntityPlayer;
|
||||||
import net.minecraft.entity.player.InventoryPlayer;
|
|
||||||
import net.minecraft.init.MobEffects;
|
|
||||||
import net.minecraft.init.SoundEvents;
|
import net.minecraft.init.SoundEvents;
|
||||||
import net.minecraft.item.ItemBlock;
|
import net.minecraft.item.ItemBlock;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
import net.minecraft.potion.PotionEffect;
|
import net.minecraft.potion.PotionEffect;
|
||||||
import net.minecraft.util.BlockRenderLayer;
|
import net.minecraft.util.BlockRenderLayer;
|
||||||
import net.minecraft.util.DamageSource;
|
|
||||||
import net.minecraft.util.EnumFacing;
|
import net.minecraft.util.EnumFacing;
|
||||||
import net.minecraft.util.EnumParticleTypes;
|
import net.minecraft.util.EnumParticleTypes;
|
||||||
import net.minecraft.util.SoundCategory;
|
import net.minecraft.util.SoundCategory;
|
||||||
|
@ -51,6 +42,9 @@ import net.minecraft.world.World;
|
||||||
import net.minecraftforge.fml.relauncher.Side;
|
import net.minecraftforge.fml.relauncher.Side;
|
||||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||||
|
|
||||||
|
import javax.annotation.Nullable;
|
||||||
|
import java.util.Random;
|
||||||
|
|
||||||
public class BlockBOPBlueFire extends Block implements IBOPBlock
|
public class BlockBOPBlueFire extends Block implements IBOPBlock
|
||||||
{
|
{
|
||||||
// implement IBOPBlock
|
// implement IBOPBlock
|
||||||
|
@ -158,7 +152,6 @@ public class BlockBOPBlueFire extends Block implements IBOPBlock
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@SideOnly(Side.CLIENT)
|
|
||||||
public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player)
|
public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player)
|
||||||
{
|
{
|
||||||
return new ItemStack(BOPItems.jar_filled, 1, ItemJarFilled.JarContents.BLUE_FIRE.ordinal());
|
return new ItemStack(BOPItems.jar_filled, 1, ItemJarFilled.JarContents.BLUE_FIRE.ordinal());
|
||||||
|
|
|
@ -89,7 +89,6 @@ public class BlockBOPDoor extends BlockDoor implements IBOPBlock
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@SideOnly(Side.CLIENT)
|
|
||||||
public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player)
|
public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player)
|
||||||
{
|
{
|
||||||
return new ItemStack(this.getDoorItem(), 1);
|
return new ItemStack(this.getDoorItem(), 1);
|
||||||
|
|
|
@ -87,6 +87,7 @@ item.crystal_shard.name=Celestial Crystal Shard
|
||||||
item.ebony_door.name=Ebony Door
|
item.ebony_door.name=Ebony Door
|
||||||
item.ethereal_door.name=Ethereal Door
|
item.ethereal_door.name=Ethereal Door
|
||||||
item.eucalyptus_door.name=Eucalyptus Door
|
item.eucalyptus_door.name=Eucalyptus Door
|
||||||
|
item.earth.name=Earth
|
||||||
item.filled_honeycomb.name=Filled Honeycomb
|
item.filled_honeycomb.name=Filled Honeycomb
|
||||||
item.fir_door.name=Fir Door
|
item.fir_door.name=Fir Door
|
||||||
item.fleshchunk.name=Chunk of Flesh
|
item.fleshchunk.name=Chunk of Flesh
|
||||||
|
|
|
@ -0,0 +1,3 @@
|
||||||
|
{
|
||||||
|
"parent": "biomesoplenty:block/blue_fire_floor0"
|
||||||
|
}
|
Loading…
Reference in New Issue