No more null icons!

This commit is contained in:
AlgorithmX2 2014-05-07 20:54:28 -05:00
parent dd74fce634
commit 0338902021
2 changed files with 11 additions and 5 deletions

View file

@ -10,10 +10,10 @@ public class FlipableIcon implements IIcon
boolean flip_v;
public FlipableIcon(IIcon o) {
if ( o == null )
throw new RuntimeException("Cannot create a wrapper icon with a null icon.");
throw new RuntimeException( "Cannot create a wrapper icon with a null icon." );
original = o;
flip_u = false;
flip_v = false;

View file

@ -1,12 +1,15 @@
package appeng.client.texture;
import net.minecraft.init.Blocks;
import net.minecraft.util.IIcon;
public class TmpFlipableIcon extends FlipableIcon
{
private static final IIcon nullIcon = new MissingIcon( Blocks.diamond_block );
public TmpFlipableIcon() {
super( null );
super( nullIcon );
}
public void setOriginal(IIcon i)
@ -14,7 +17,10 @@ public class TmpFlipableIcon extends FlipableIcon
while (i instanceof FlipableIcon)
i = ((FlipableIcon) i).getOriginal();
original = i;
if ( i == null )
original = nullIcon;
else
original = i;
}
}