diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPBlueFire.java b/src/main/java/biomesoplenty/common/block/BlockBOPBlueFire.java index f8d3a281f..44c4079a2 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPBlueFire.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPBlueFire.java @@ -8,12 +8,6 @@ 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.particle.BOPParticleTypes; 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.EntityLivingBase; 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.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.potion.PotionEffect; import net.minecraft.util.BlockRenderLayer; -import net.minecraft.util.DamageSource; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumParticleTypes; 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.SideOnly; +import javax.annotation.Nullable; +import java.util.Random; + public class BlockBOPBlueFire extends Block implements IBOPBlock { // implement IBOPBlock @@ -158,7 +152,6 @@ public class BlockBOPBlueFire extends Block implements IBOPBlock } @Override - @SideOnly(Side.CLIENT) 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()); diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPDoor.java b/src/main/java/biomesoplenty/common/block/BlockBOPDoor.java index 0f2525bff..f532fa505 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPDoor.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPDoor.java @@ -89,7 +89,6 @@ public class BlockBOPDoor extends BlockDoor implements IBOPBlock } @Override - @SideOnly(Side.CLIENT) public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { return new ItemStack(this.getDoorItem(), 1); diff --git a/src/main/resources/assets/biomesoplenty/lang/en_US.lang b/src/main/resources/assets/biomesoplenty/lang/en_US.lang index 8946ac618..6d160ae55 100644 --- a/src/main/resources/assets/biomesoplenty/lang/en_US.lang +++ b/src/main/resources/assets/biomesoplenty/lang/en_US.lang @@ -87,6 +87,7 @@ item.crystal_shard.name=Celestial Crystal Shard item.ebony_door.name=Ebony Door item.ethereal_door.name=Ethereal Door item.eucalyptus_door.name=Eucalyptus Door +item.earth.name=Earth item.filled_honeycomb.name=Filled Honeycomb item.fir_door.name=Fir Door item.fleshchunk.name=Chunk of Flesh diff --git a/src/main/resources/assets/biomesoplenty/models/item/blue_fire.json b/src/main/resources/assets/biomesoplenty/models/item/blue_fire.json new file mode 100644 index 000000000..914a87d98 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/item/blue_fire.json @@ -0,0 +1,3 @@ +{ + "parent": "biomesoplenty:block/blue_fire_floor0" +}