Skip to content

Commit

Permalink
Obtain fancyGraphics flag from elsewhere
Browse files Browse the repository at this point in the history
  • Loading branch information
fuj1n committed Jan 19, 2014
1 parent 70be541 commit 15f5b84
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 6 deletions.
4 changes: 2 additions & 2 deletions src/main/java/tconstruct/blocks/OreberryBush.java
Expand Up @@ -75,7 +75,7 @@ public void func_149651_a (IIconRegister iconRegister)
@SideOnly(Side.CLIENT)
public IIcon func_149691_a (int side, int metadata)
{
if (net.minecraft.client.settings.GameSettings.Options.GRAPHICS.getEnumBoolean())
if (net.minecraft.client.Minecraft.getMinecraft().gameSettings.fancyGraphics)
{
if (metadata < 12)
{
Expand Down Expand Up @@ -236,7 +236,7 @@ public int getRenderType ()
@SideOnly(Side.CLIENT)
public boolean func_149646_a (IBlockAccess iblockaccess, int x, int y, int z, int meta)
{
if (meta > 7 || net.minecraft.client.settings.GameSettings.Options.GRAPHICS.getEnumBoolean())
if (meta > 7 || net.minecraft.client.Minecraft.getMinecraft().gameSettings.fancyGraphics)
{
return super.func_149646_a(iblockaccess, x, y, z, meta);
}
Expand Down
5 changes: 1 addition & 4 deletions src/main/java/tconstruct/blocks/slime/SlimeLeaves.java
Expand Up @@ -3,17 +3,14 @@
import java.util.List;
import java.util.Random;

import net.minecraft.block.Block;
import net.minecraft.block.BlockLeaves;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.client.settings.GameSettings.Options;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import tconstruct.common.TContent;
import tconstruct.common.TRepo;
import tconstruct.library.TConstructRegistry;
import cpw.mods.fml.relauncher.Side;
Expand Down Expand Up @@ -74,7 +71,7 @@ public IIcon func_149691_a (int side, int meta)
{
int tex = meta % 4;

if (Options.GRAPHICS.getEnumBoolean())
if (net.minecraft.client.Minecraft.getMinecraft().gameSettings.fancyGraphics)
return fancyIcons[tex];
else
return fastIcons[tex];
Expand Down

0 comments on commit 15f5b84

Please sign in to comment.