fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename IRenderHelper to ModelGenerator

Browse Source
This commit is contained in:
thatsIch
2015-06-22 18:16:25 +02:00
parent cc78153fe4
commit 28c30c44c5
62 changed files with 231 additions and 235 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/parts/networking/PartCable.java
+13 -13
View File
@@ -55,7 +55,7 @@ import appeng.api.util.AEColoredItemDefinition;
import appeng.api.util.AEPartLocation;
import appeng.api.util.IReadOnlyCollection;
import appeng.block.AEBaseBlock;
import appeng.client.render.IRenderHelper;
import appeng.client.render.ModelGenerator;
import appeng.client.texture.CableBusTextures;
import appeng.client.texture.FlippableIcon;
import appeng.client.texture.IAESprite;
@@ -259,7 +259,7 @@ public class PartCable extends AEBasePart implements IPartCable
@Override
@SideOnly( Side.CLIENT )
public void renderInventory( IPartRenderHelper rh, IRenderHelper renderer )
public void renderInventory( IPartRenderHelper rh, ModelGenerator renderer )
{
GL11.glTranslated( -0.0, -0.0, 0.3 );
@@ -269,12 +269,12 @@ public class PartCable extends AEBasePart implements IPartCable
rh.setTexture( null );
}
public IAESprite getTexture( AEColor c,IRenderHelper renderer )
public IAESprite getTexture( AEColor c,ModelGenerator renderer )
{
return this.getGlassTexture( c,renderer );
}
public IAESprite getGlassTexture( AEColor c,IRenderHelper renderer )
public IAESprite getGlassTexture( AEColor c,ModelGenerator renderer )
{
switch( c )
{
@@ -327,7 +327,7 @@ public class PartCable extends AEBasePart implements IPartCable
@Override
@SideOnly( Side.CLIENT )
public void renderStatic( BlockPos pos, IPartRenderHelper rh, IRenderHelper renderer )
public void renderStatic( BlockPos pos, IPartRenderHelper rh, ModelGenerator renderer )
{
boolean useCovered = false;
boolean requireDetailed = false;
@@ -598,12 +598,12 @@ public class PartCable extends AEBasePart implements IPartCable
@Override
@SideOnly( Side.CLIENT )
public TextureAtlasSprite getBreakingTexture( IRenderHelper renderer )
public TextureAtlasSprite getBreakingTexture( ModelGenerator renderer )
{
return this.getTexture( this.getCableColor(), renderer ).getAtlas();
}
public IAESprite getCoveredTexture( AEColor c, IRenderHelper renderer )
public IAESprite getCoveredTexture( AEColor c, ModelGenerator renderer )
{
switch( c )
{
@@ -654,7 +654,7 @@ public class PartCable extends AEBasePart implements IPartCable
}
@SideOnly( Side.CLIENT )
public void renderGlassConnection( BlockPos pos, IPartRenderHelper rh, IRenderHelper renderer, AEPartLocation of )
public void renderGlassConnection( BlockPos pos, IPartRenderHelper rh, ModelGenerator renderer, AEPartLocation of )
{
TileEntity te = this.tile.getWorld().getTileEntity( pos.offset( of.getFacing() ) );
IPartHost partHost = te instanceof IPartHost ? (IPartHost) te : null;
@@ -730,7 +730,7 @@ public class PartCable extends AEBasePart implements IPartCable
}
@SideOnly( Side.CLIENT )
public void renderCoveredConnection( BlockPos pos, IPartRenderHelper rh, IRenderHelper renderer, int channels, AEPartLocation of )
public void renderCoveredConnection( BlockPos pos, IPartRenderHelper rh, ModelGenerator renderer, int channels, AEPartLocation of )
{
TileEntity te = this.tile.getWorld().getTileEntity( pos.offset( of.getFacing() ) );
IPartHost partHost = te instanceof IPartHost ? (IPartHost) te : null;
@@ -811,7 +811,7 @@ public class PartCable extends AEBasePart implements IPartCable
}
@SideOnly( Side.CLIENT )
public void renderSmartConnection( BlockPos pos, IPartRenderHelper rh, IRenderHelper renderer, int channels, AEPartLocation of )
public void renderSmartConnection( BlockPos pos, IPartRenderHelper rh, ModelGenerator renderer, int channels, AEPartLocation of )
{
TileEntity te = this.tile.getWorld().getTileEntity( pos.offset( of.getFacing() ) );
IPartHost partHost = te instanceof IPartHost ? (IPartHost) te : null;
@@ -935,7 +935,7 @@ public class PartCable extends AEBasePart implements IPartCable
}
}
public IAESprite getSmartTexture( AEColor c, IRenderHelper renderer )
public IAESprite getSmartTexture( AEColor c, ModelGenerator renderer )
{
switch( c )
{
@@ -981,7 +981,7 @@ public class PartCable extends AEBasePart implements IPartCable
}
@SideOnly( Side.CLIENT )
protected void setSmartConnectionRotations( AEPartLocation of, IRenderHelper renderer )
protected void setSmartConnectionRotations( AEPartLocation of, ModelGenerator renderer )
{
switch( of )
{
@@ -1056,7 +1056,7 @@ public class PartCable extends AEBasePart implements IPartCable
}
@SideOnly( Side.CLIENT )
protected void renderAllFaces( AEBaseBlock blk, BlockPos pos, IPartRenderHelper rh, IRenderHelper renderer )
protected void renderAllFaces( AEBaseBlock blk, BlockPos pos, IPartRenderHelper rh, ModelGenerator renderer )
{
rh.setBounds( (float) renderer.renderMinX * 16.0f, (float) renderer.renderMinY * 16.0f, (float) renderer.renderMinZ * 16.0f, (float) renderer.renderMaxX * 16.0f, (float) renderer.renderMaxY * 16.0f, (float) renderer.renderMaxZ * 16.0f );
rh.renderFace( pos, blk.getRendererInstance().getTexture( AEPartLocation.WEST ), EnumFacing.WEST, renderer );
src/main/java/appeng/parts/networking/PartCableCovered.java
+4 -4
View File
@@ -41,7 +41,7 @@ import appeng.api.parts.IPartRenderHelper;
import appeng.api.util.AECableType;
import appeng.api.util.AEColor;
import appeng.api.util.AEPartLocation;
import appeng.client.render.IRenderHelper;
import appeng.client.render.ModelGenerator;
import appeng.client.texture.IAESprite;
import appeng.client.texture.OffsetIcon;
import appeng.helpers.Reflected;
@@ -121,7 +121,7 @@ public class PartCableCovered extends PartCable
@Override
@SideOnly( Side.CLIENT )
public void renderInventory( IPartRenderHelper rh, IRenderHelper renderer )
public void renderInventory( IPartRenderHelper rh, ModelGenerator renderer )
{
GL11.glTranslated( -0.0, -0.0, 0.3 );
@@ -156,14 +156,14 @@ public class PartCableCovered extends PartCable
}
@Override
public IAESprite getTexture( AEColor c, IRenderHelper renderer )
public IAESprite getTexture( AEColor c, ModelGenerator renderer )
{
return this.getCoveredTexture( c, renderer );
}
@Override
@SideOnly( Side.CLIENT )
public void renderStatic( BlockPos pos, IPartRenderHelper rh, IRenderHelper renderer )
public void renderStatic( BlockPos pos, IPartRenderHelper rh, ModelGenerator renderer )
{
rh.setTexture( this.getTexture( this.getCableColor(), renderer ) );
src/main/java/appeng/parts/networking/PartCableSmart.java
+4 -4
View File
@@ -42,7 +42,7 @@ import appeng.api.util.AECableType;
import appeng.api.util.AEColor;
import appeng.api.util.AEPartLocation;
import appeng.block.AEBaseBlock;
import appeng.client.render.IRenderHelper;
import appeng.client.render.ModelGenerator;
import appeng.client.texture.FlippableIcon;
import appeng.client.texture.IAESprite;
import appeng.client.texture.OffsetIcon;
@@ -124,7 +124,7 @@ public class PartCableSmart extends PartCable
@Override
@SideOnly( Side.CLIENT )
public void renderInventory( IPartRenderHelper rh, IRenderHelper renderer )
public void renderInventory( IPartRenderHelper rh, ModelGenerator renderer )
{
GL11.glTranslated( -0.0, -0.0, 0.3 );
@@ -173,14 +173,14 @@ public class PartCableSmart extends PartCable
}
@Override
public IAESprite getTexture( AEColor c, IRenderHelper renderer )
public IAESprite getTexture( AEColor c, ModelGenerator renderer )
{
return this.getSmartTexture( c, renderer );
}
@Override
@SideOnly( Side.CLIENT )
public void renderStatic( BlockPos pos, IPartRenderHelper rh, IRenderHelper renderer )
public void renderStatic( BlockPos pos, IPartRenderHelper rh, ModelGenerator renderer )
{
rh.setTexture( this.getTexture( this.getCableColor(), renderer ) );
src/main/java/appeng/parts/networking/PartDenseCable.java
+6 -6
View File
@@ -45,7 +45,7 @@ import appeng.api.util.AECableType;
import appeng.api.util.AEColor;
import appeng.api.util.AEPartLocation;
import appeng.block.AEBaseBlock;
import appeng.client.render.IRenderHelper;
import appeng.client.render.ModelGenerator;
import appeng.client.texture.CableBusTextures;
import appeng.client.texture.FlippableIcon;
import appeng.client.texture.IAESprite;
@@ -156,7 +156,7 @@ public class PartDenseCable extends PartCable
@Override
@SideOnly( Side.CLIENT )
public void renderInventory( IPartRenderHelper rh, IRenderHelper renderer )
public void renderInventory( IPartRenderHelper rh, ModelGenerator renderer )
{
GL11.glTranslated( -0.0, -0.0, 0.3 );
rh.setBounds( 4.0f, 4.0f, 2.0f, 12.0f, 12.0f, 14.0f );
@@ -203,7 +203,7 @@ public class PartDenseCable extends PartCable
}
@Override
public IAESprite getTexture( AEColor c, IRenderHelper renderer )
public IAESprite getTexture( AEColor c, ModelGenerator renderer )
{
if( c == AEColor.Transparent )
{
@@ -215,7 +215,7 @@ public class PartDenseCable extends PartCable
@Override
@SideOnly( Side.CLIENT )
public void renderStatic( BlockPos pos, IPartRenderHelper rh, IRenderHelper renderer )
public void renderStatic( BlockPos pos, IPartRenderHelper rh, ModelGenerator renderer )
{
rh.setTexture( this.getTexture( this.getCableColor(), renderer ) );
@@ -359,7 +359,7 @@ public class PartDenseCable extends PartCable
}
@SideOnly( Side.CLIENT )
public void renderDenseConnection( BlockPos pos, IPartRenderHelper rh, IRenderHelper renderer, int channels, AEPartLocation of )
public void renderDenseConnection( BlockPos pos, IPartRenderHelper rh, ModelGenerator renderer, int channels, AEPartLocation of )
{
TileEntity te = this.tile.getWorld().getTileEntity( pos.offset( of.getFacing() ) );
IPartHost partHost = te instanceof IPartHost ? (IPartHost) te : null;
@@ -465,7 +465,7 @@ public class PartDenseCable extends PartCable
return false;
}
private IAESprite getDenseTexture( AEColor c, IRenderHelper renderer )
private IAESprite getDenseTexture( AEColor c, ModelGenerator renderer )
{
switch( c )
{
src/main/java/appeng/parts/networking/PartQuartzFiber.java
+3 -3
View File
@@ -42,7 +42,7 @@ import appeng.api.parts.IPartHost;
import appeng.api.parts.IPartRenderHelper;
import appeng.api.util.AECableType;
import appeng.api.util.AEPartLocation;
import appeng.client.render.IRenderHelper;
import appeng.client.render.ModelGenerator;
import appeng.client.texture.IAESprite;
import appeng.me.GridAccessException;
import appeng.me.helpers.AENetworkProxy;
@@ -77,7 +77,7 @@ public class PartQuartzFiber extends AEBasePart implements IEnergyGridProvider
@Override
@SideOnly( Side.CLIENT )
public void renderInventory( IPartRenderHelper rh, IRenderHelper renderer )
public void renderInventory( IPartRenderHelper rh, ModelGenerator renderer )
{
GL11.glTranslated( -0.2, -0.3, 0.0 );
@@ -89,7 +89,7 @@ public class PartQuartzFiber extends AEBasePart implements IEnergyGridProvider
@Override
@SideOnly( Side.CLIENT )
public void renderStatic( BlockPos pos, IPartRenderHelper rh, IRenderHelper renderer )
public void renderStatic( BlockPos pos, IPartRenderHelper rh, ModelGenerator renderer )
{
IAESprite myIcon = renderer.getIcon( is );
rh.setTexture( myIcon );