Most of the 1.8 Port.

This commit is contained in:
AlgorithmX2
2015-06-15 19:44:59 -05:00
parent 17465e68e8
commit 38afde724b
824 changed files with 12120 additions and 9158 deletions
@@ -19,28 +19,27 @@
package appeng.client.texture;
import net.minecraft.util.IIcon;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
public class OffsetIcon implements IIcon
public class OffsetIcon implements IAESprite
{
final float offsetX;
final float offsetY;
private final IIcon p;
private final IAESprite p;
public OffsetIcon( IIcon o, float x, float y )
public OffsetIcon( IAESprite iIcon, float x, float y )
{
if( o == null )
if( iIcon == null )
{
throw new IllegalArgumentException( "Cannot create a wrapper icon with a null icon." );
}
this.p = o;
this.p = iIcon;
this.offsetX = x;
this.offsetY = y;
}
@@ -115,4 +114,10 @@ public class OffsetIcon implements IIcon
{
return this.p.getInterpolatedU( Math.min( 16.0, Math.max( 0.0, d ) ) );
}
@Override
public TextureAtlasSprite getAtlas()
{
return p.getAtlas();
}
}