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/AEBasePart.java
+5 -5
View File
@@ -63,7 +63,7 @@ import appeng.api.util.AEColor;
import appeng.api.util.AEPartLocation;
import appeng.api.util.DimensionalCoord;
import appeng.api.util.IConfigManager;
import appeng.client.render.IRenderHelper;
import appeng.client.render.ModelGenerator;
import appeng.helpers.ICustomNameObject;
import appeng.helpers.IPriorityHost;
import appeng.me.helpers.AENetworkProxy;
@@ -145,7 +145,7 @@ public abstract class AEBasePart implements IPart, IGridProxyable, IActionHost,
@Override
@SideOnly( Side.CLIENT )
public void renderInventory( IPartRenderHelper rh, IRenderHelper renderer )
public void renderInventory( IPartRenderHelper rh, ModelGenerator renderer )
{
rh.setBounds( 1, 1, 1, 15, 15, 15 );
rh.renderInventoryBox( renderer );
@@ -197,7 +197,7 @@ public abstract class AEBasePart implements IPart, IGridProxyable, IActionHost,
@Override
@SideOnly( Side.CLIENT )
public void renderStatic( BlockPos pos, IPartRenderHelper rh, IRenderHelper renderer )
public void renderStatic( BlockPos pos, IPartRenderHelper rh, ModelGenerator renderer )
{
rh.setBounds( 1, 1, 1, 15, 15, 15 );
rh.renderBlock( pos, renderer );
@@ -216,7 +216,7 @@ public abstract class AEBasePart implements IPart, IGridProxyable, IActionHost,
@Override
@SideOnly( Side.CLIENT )
public void renderDynamic( double x, double y, double z, IPartRenderHelper rh, IRenderHelper renderer )
public void renderDynamic( double x, double y, double z, IPartRenderHelper rh, ModelGenerator renderer )
{
}
@@ -543,7 +543,7 @@ public abstract class AEBasePart implements IPart, IGridProxyable, IActionHost,
@Override
@SideOnly( Side.CLIENT )
public TextureAtlasSprite getBreakingTexture(IRenderHelper renderer)
public TextureAtlasSprite getBreakingTexture(ModelGenerator renderer)
{
return null;
}
src/main/java/appeng/parts/PartBasicState.java
+4 -4
View File
@@ -35,7 +35,7 @@ import appeng.api.networking.events.MENetworkChannelsChanged;
import appeng.api.networking.events.MENetworkEventSubscribe;
import appeng.api.networking.events.MENetworkPowerStatusChange;
import appeng.api.parts.IPartRenderHelper;
import appeng.client.render.IRenderHelper;
import appeng.client.render.ModelGenerator;
import appeng.client.texture.CableBusTextures;
import appeng.me.GridAccessException;
@@ -67,7 +67,7 @@ public abstract class PartBasicState extends AEBasePart implements IPowerChannel
}
@SideOnly( Side.CLIENT )
public void renderLights( BlockPos pos, IPartRenderHelper rh, IRenderHelper renderer )
public void renderLights( BlockPos pos, IPartRenderHelper rh, ModelGenerator renderer )
{
this.setColors( renderer, ( this.clientFlags & ( this.POWERED_FLAG | this.CHANNEL_FLAG ) ) == ( this.POWERED_FLAG | this.CHANNEL_FLAG ), ( this.clientFlags & this.POWERED_FLAG ) == this.POWERED_FLAG );
rh.renderFace( pos, CableBusTextures.PartMonitorSidesStatusLights.getIcon(), EnumFacing.EAST, renderer );
@@ -76,7 +76,7 @@ public abstract class PartBasicState extends AEBasePart implements IPowerChannel
rh.renderFace( pos, CableBusTextures.PartMonitorSidesStatusLights.getIcon(), EnumFacing.DOWN, renderer );
}
public void setColors( IRenderHelper renderer, boolean hasChan, boolean hasPower )
public void setColors( ModelGenerator renderer, boolean hasChan, boolean hasPower )
{
if( hasChan )
{
@@ -144,7 +144,7 @@ public abstract class PartBasicState extends AEBasePart implements IPowerChannel
@Override
@SideOnly( Side.CLIENT )
public TextureAtlasSprite getBreakingTexture( IRenderHelper renderer )
public TextureAtlasSprite getBreakingTexture( ModelGenerator renderer )
{
return CableBusTextures.PartTransitionPlaneBack.getIcon().getAtlas();
}
src/main/java/appeng/parts/automation/PartAnnihilationPlane.java
+4 -4
View File
@@ -54,7 +54,7 @@ import appeng.api.parts.IPartHost;
import appeng.api.parts.IPartRenderHelper;
import appeng.api.storage.data.IAEItemStack;
import appeng.api.util.AEPartLocation;
import appeng.client.render.IRenderHelper;
import appeng.client.render.ModelGenerator;
import appeng.client.texture.CableBusTextures;
import appeng.client.texture.IAESprite;
import appeng.core.settings.TickRates;
@@ -137,7 +137,7 @@ public class PartAnnihilationPlane extends PartBasicState implements IGridTickab
@Override
@SideOnly( Side.CLIENT )
public void renderInventory( IPartRenderHelper rh, IRenderHelper renderer )
public void renderInventory( IPartRenderHelper rh, ModelGenerator renderer )
{
rh.setTexture( SIDE_ICON, SIDE_ICON, BACK_ICON, renderer.getIcon( is ), SIDE_ICON, SIDE_ICON );
@@ -150,12 +150,12 @@ public class PartAnnihilationPlane extends PartBasicState implements IGridTickab
@Override
@SideOnly( Side.CLIENT )
public void renderStatic( BlockPos pos, IPartRenderHelper rh, IRenderHelper renderer )
public void renderStatic( BlockPos pos, IPartRenderHelper rh, ModelGenerator renderer )
{
this.renderStaticWithIcon( pos, rh, renderer, ACTIVE_ICON );
}
protected void renderStaticWithIcon( BlockPos opos, IPartRenderHelper rh, IRenderHelper renderer, IAESprite activeIcon )
protected void renderStaticWithIcon( BlockPos opos, IPartRenderHelper rh, ModelGenerator renderer, IAESprite activeIcon )
{
int minX = 1;
int minY = 1;
src/main/java/appeng/parts/automation/PartExportBus.java
+3 -3
View File
@@ -47,7 +47,7 @@ import appeng.api.parts.IPartRenderHelper;
import appeng.api.storage.IMEInventory;
import appeng.api.storage.IMEMonitor;
import appeng.api.storage.data.IAEItemStack;
import appeng.client.render.IRenderHelper;
import appeng.client.render.ModelGenerator;
import appeng.client.texture.CableBusTextures;
import appeng.core.AELog;
import appeng.core.settings.TickRates;
@@ -192,7 +192,7 @@ public class PartExportBus extends PartSharedItemBus implements ICraftingRequest
@Override
@SideOnly( Side.CLIENT )
public void renderInventory( IPartRenderHelper rh, IRenderHelper renderer )
public void renderInventory( IPartRenderHelper rh, ModelGenerator renderer )
{
rh.setTexture( CableBusTextures.PartExportSides.getIcon(), CableBusTextures.PartExportSides.getIcon(), CableBusTextures.PartMonitorBack.getIcon(), renderer.getIcon( is ), CableBusTextures.PartExportSides.getIcon(), CableBusTextures.PartExportSides.getIcon() );
@@ -209,7 +209,7 @@ public class PartExportBus extends PartSharedItemBus implements ICraftingRequest
@Override
@SideOnly( Side.CLIENT )
public void renderStatic( BlockPos pos, IPartRenderHelper rh, IRenderHelper renderer )
public void renderStatic( BlockPos pos, IPartRenderHelper rh, ModelGenerator renderer )
{
rh.setTexture( CableBusTextures.PartExportSides.getIcon(), CableBusTextures.PartExportSides.getIcon(), CableBusTextures.PartMonitorBack.getIcon(), renderer.getIcon( is ), CableBusTextures.PartExportSides.getIcon(), CableBusTextures.PartExportSides.getIcon() );
src/main/java/appeng/parts/automation/PartFormationPlane.java
+3 -3
View File
@@ -69,7 +69,7 @@ import appeng.api.storage.data.IAEItemStack;
import appeng.api.storage.data.IItemList;
import appeng.api.util.AEPartLocation;
import appeng.api.util.IConfigManager;
import appeng.client.render.IRenderHelper;
import appeng.client.render.ModelGenerator;
import appeng.client.texture.CableBusTextures;
import appeng.core.AEConfig;
import appeng.core.sync.GuiBridge;
@@ -265,7 +265,7 @@ public class PartFormationPlane extends PartUpgradeable implements ICellContaine
@Override
@SideOnly( Side.CLIENT )
public void renderInventory( IPartRenderHelper rh, IRenderHelper renderer )
public void renderInventory( IPartRenderHelper rh, ModelGenerator renderer )
{
rh.setTexture( CableBusTextures.PartPlaneSides.getIcon(), CableBusTextures.PartPlaneSides.getIcon(), CableBusTextures.PartTransitionPlaneBack.getIcon(), renderer.getIcon( is ), CableBusTextures.PartPlaneSides.getIcon(), CableBusTextures.PartPlaneSides.getIcon() );
@@ -278,7 +278,7 @@ public class PartFormationPlane extends PartUpgradeable implements ICellContaine
@Override
@SideOnly( Side.CLIENT )
public void renderStatic( BlockPos opos, IPartRenderHelper rh, IRenderHelper renderer )
public void renderStatic( BlockPos opos, IPartRenderHelper rh, ModelGenerator renderer )
{
int minX = 1;
int minY = 1;
src/main/java/appeng/parts/automation/PartIdentityAnnihilationPlane.java
+2 -2
View File
@@ -36,7 +36,7 @@ import appeng.api.parts.IPart;
import appeng.api.parts.IPartHost;
import appeng.api.parts.IPartRenderHelper;
import appeng.api.util.AEPartLocation;
import appeng.client.render.IRenderHelper;
import appeng.client.render.ModelGenerator;
import appeng.client.texture.CableBusTextures;
import appeng.client.texture.IAESprite;
@@ -54,7 +54,7 @@ public class PartIdentityAnnihilationPlane extends PartAnnihilationPlane
@Override
@SideOnly( Side.CLIENT )
public void renderStatic( BlockPos pos, IPartRenderHelper rh, IRenderHelper renderer )
public void renderStatic( BlockPos pos, IPartRenderHelper rh, ModelGenerator renderer )
{
this.renderStaticWithIcon( pos, rh, renderer, ACTIVE_ICON );
}
src/main/java/appeng/parts/automation/PartImportBus.java
+3 -3
View File
@@ -44,7 +44,7 @@ import appeng.api.parts.IPartRenderHelper;
import appeng.api.storage.IMEInventory;
import appeng.api.storage.IMEMonitor;
import appeng.api.storage.data.IAEItemStack;
import appeng.client.render.IRenderHelper;
import appeng.client.render.ModelGenerator;
import appeng.client.texture.CableBusTextures;
import appeng.core.settings.TickRates;
import appeng.core.sync.GuiBridge;
@@ -99,7 +99,7 @@ public class PartImportBus extends PartSharedItemBus implements IInventoryDestin
@Override
@SideOnly( Side.CLIENT )
public void renderInventory( IPartRenderHelper rh, IRenderHelper renderer )
public void renderInventory( IPartRenderHelper rh, ModelGenerator renderer )
{
rh.setTexture( CableBusTextures.PartImportSides.getIcon(), CableBusTextures.PartImportSides.getIcon(), CableBusTextures.PartMonitorBack.getIcon(), renderer.getIcon( is ), CableBusTextures.PartImportSides.getIcon(), CableBusTextures.PartImportSides.getIcon() );
@@ -115,7 +115,7 @@ public class PartImportBus extends PartSharedItemBus implements IInventoryDestin
@Override
@SideOnly( Side.CLIENT )
public void renderStatic( BlockPos pos, IPartRenderHelper rh, IRenderHelper renderer )
public void renderStatic( BlockPos pos, IPartRenderHelper rh, ModelGenerator renderer )
{
rh.setTexture( CableBusTextures.PartImportSides.getIcon(), CableBusTextures.PartImportSides.getIcon(), CableBusTextures.PartMonitorBack.getIcon(), renderer.getIcon( is ), CableBusTextures.PartImportSides.getIcon(), CableBusTextures.PartImportSides.getIcon() );
src/main/java/appeng/parts/automation/PartLevelEmitter.java
+6 -6
View File
@@ -70,7 +70,7 @@ import appeng.api.storage.data.IItemList;
import appeng.api.util.AECableType;
import appeng.api.util.AEPartLocation;
import appeng.api.util.IConfigManager;
import appeng.client.render.IRenderHelper;
import appeng.client.render.ModelGenerator;
import appeng.client.texture.CableBusTextures;
import appeng.client.texture.IAESprite;
import appeng.core.sync.GuiBridge;
@@ -192,7 +192,7 @@ public class PartLevelEmitter extends PartUpgradeable implements IEnergyWatcherH
}
@Override
public TextureAtlasSprite getBreakingTexture( IRenderHelper renderer )
public TextureAtlasSprite getBreakingTexture( ModelGenerator renderer )
{
return renderer.getIcon( is ).getAtlas();
}
@@ -412,13 +412,13 @@ public class PartLevelEmitter extends PartUpgradeable implements IEnergyWatcherH
@Override
@SideOnly( Side.CLIENT )
public void renderInventory( IPartRenderHelper rh, IRenderHelper renderer )
public void renderInventory( IPartRenderHelper rh, ModelGenerator renderer )
{
rh.setTexture( renderer.getIcon( is ) );
this.renderTorchAtAngle( 0, -0.5, 0, renderer );
}
public void renderTorchAtAngle( double baseX, double baseY, double baseZ, IRenderHelper renderer )
public void renderTorchAtAngle( double baseX, double baseY, double baseZ, ModelGenerator renderer )
{
boolean isOn = this.isLevelEmitterOn();
IAESprite offTexture = renderer.getIcon( is );
@@ -527,7 +527,7 @@ public class PartLevelEmitter extends PartUpgradeable implements IEnergyWatcherH
this.addVertexWithUV(t,renderer, var36, baseY + 1.0D, baseZ - var44, var17, var18 );
}
public void addVertexWithUV( EnumFacing face, IRenderHelper renderer, double x, double y, double z, double u, double v )
public void addVertexWithUV( EnumFacing face, ModelGenerator renderer, double x, double y, double z, double u, double v )
{
x -= this.centerX;
y -= this.centerY;
@@ -578,7 +578,7 @@ public class PartLevelEmitter extends PartUpgradeable implements IEnergyWatcherH
@Override
@SideOnly( Side.CLIENT )
public void renderStatic( BlockPos pos, IPartRenderHelper rh, IRenderHelper renderer )
public void renderStatic( BlockPos pos, IPartRenderHelper rh, ModelGenerator renderer )
{
rh.setTexture( renderer.getIcon( is ) );
// rh.setTexture( CableBusTextures.ItemPartLevelEmitterOn.getIcon() );
src/main/java/appeng/parts/misc/PartCableAnchor.java
+5 -5
View File
@@ -45,7 +45,7 @@ import appeng.api.parts.IPartHost;
import appeng.api.parts.IPartRenderHelper;
import appeng.api.parts.PartItemStack;
import appeng.api.util.AEPartLocation;
import appeng.client.render.IRenderHelper;
import appeng.client.render.ModelGenerator;
import appeng.client.texture.IAESprite;
@@ -82,7 +82,7 @@ public class PartCableAnchor implements IPart
@Override
@SideOnly( Side.CLIENT )
public void renderInventory( IPartRenderHelper instance, IRenderHelper renderer )
public void renderInventory( IPartRenderHelper instance, ModelGenerator renderer )
{
instance.setTexture( renderer.getIcon( is ) );
instance.setBounds( 7, 7, 4, 9, 9, 14 );
@@ -92,7 +92,7 @@ public class PartCableAnchor implements IPart
@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 );
@@ -110,13 +110,13 @@ public class PartCableAnchor implements IPart
@Override
@SideOnly( Side.CLIENT )
public void renderDynamic( double x, double y, double z, IPartRenderHelper rh, IRenderHelper renderer )
public void renderDynamic( double x, double y, double z, IPartRenderHelper rh, ModelGenerator renderer )
{
}
@Override
public TextureAtlasSprite getBreakingTexture( IRenderHelper renderer)
public TextureAtlasSprite getBreakingTexture( ModelGenerator renderer)
{
return null;
}
src/main/java/appeng/parts/misc/PartInterface.java
+4 -4
View File
@@ -57,7 +57,7 @@ import appeng.api.storage.IStorageMonitorable;
import appeng.api.storage.data.IAEFluidStack;
import appeng.api.storage.data.IAEItemStack;
import appeng.api.util.IConfigManager;
import appeng.client.render.IRenderHelper;
import appeng.client.render.ModelGenerator;
import appeng.client.texture.CableBusTextures;
import appeng.core.sync.GuiBridge;
import appeng.helpers.DualityInterface;
@@ -111,7 +111,7 @@ public class PartInterface extends PartBasicState implements IGridTickable, ISto
@Override
@SideOnly( Side.CLIENT )
public void renderInventory( IPartRenderHelper rh, IRenderHelper renderer )
public void renderInventory( IPartRenderHelper rh, ModelGenerator renderer )
{
rh.setTexture( CableBusTextures.PartMonitorSides.getIcon(), CableBusTextures.PartMonitorSides.getIcon(), CableBusTextures.PartMonitorBack.getIcon(), renderer.getIcon( is ), CableBusTextures.PartMonitorSides.getIcon(), CableBusTextures.PartMonitorSides.getIcon() );
@@ -133,7 +133,7 @@ public class PartInterface extends PartBasicState implements IGridTickable, ISto
@Override
@SideOnly( Side.CLIENT )
public void renderStatic( BlockPos pos, IPartRenderHelper rh, IRenderHelper renderer )
public void renderStatic( BlockPos pos, IPartRenderHelper rh, ModelGenerator renderer )
{
rh.setTexture( CableBusTextures.PartMonitorSides.getIcon(), CableBusTextures.PartMonitorSides.getIcon(), CableBusTextures.PartMonitorBack.getIcon(), renderer.getIcon( is ), CableBusTextures.PartMonitorSides.getIcon(), CableBusTextures.PartMonitorSides.getIcon() );
@@ -215,7 +215,7 @@ public class PartInterface extends PartBasicState implements IGridTickable, ISto
}
@Override
public TextureAtlasSprite getBreakingTexture(IRenderHelper renderer)
public TextureAtlasSprite getBreakingTexture(ModelGenerator renderer)
{
return renderer.getIcon( is ).getAtlas();
}
src/main/java/appeng/parts/misc/PartStorageBus.java
+3 -3
View File
@@ -65,7 +65,7 @@ import appeng.api.storage.data.IAEItemStack;
import appeng.api.storage.data.IItemList;
import appeng.api.util.AEPartLocation;
import appeng.api.util.IConfigManager;
import appeng.client.render.IRenderHelper;
import appeng.client.render.ModelGenerator;
import appeng.client.texture.CableBusTextures;
import appeng.core.settings.TickRates;
import appeng.core.stats.Achievements;
@@ -261,7 +261,7 @@ public class PartStorageBus extends PartUpgradeable implements IGridTickable, IC
@Override
@SideOnly( Side.CLIENT )
public void renderInventory( IPartRenderHelper rh, IRenderHelper renderer )
public void renderInventory( IPartRenderHelper rh, ModelGenerator renderer )
{
rh.setTexture( CableBusTextures.PartStorageSides.getIcon(), CableBusTextures.PartStorageSides.getIcon(), CableBusTextures.PartStorageBack.getIcon(), renderer.getIcon( is ), CableBusTextures.PartStorageSides.getIcon(), CableBusTextures.PartStorageSides.getIcon() );
@@ -277,7 +277,7 @@ public class PartStorageBus extends PartUpgradeable implements IGridTickable, IC
@Override
@SideOnly( Side.CLIENT )
public void renderStatic( BlockPos pos, IPartRenderHelper rh, IRenderHelper renderer )
public void renderStatic( BlockPos pos, IPartRenderHelper rh, ModelGenerator renderer )
{
rh.setTexture( CableBusTextures.PartStorageSides.getIcon(), CableBusTextures.PartStorageSides.getIcon(), CableBusTextures.PartStorageBack.getIcon(), renderer.getIcon( is ), CableBusTextures.PartStorageSides.getIcon(), CableBusTextures.PartStorageSides.getIcon() );
src/main/java/appeng/parts/misc/PartToggleBus.java
+5 -5
View File
@@ -43,7 +43,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.CableBusTextures;
import appeng.helpers.Reflected;
import appeng.me.helpers.AENetworkProxy;
@@ -70,7 +70,7 @@ public class PartToggleBus extends PartBasicState
}
@Override
public void setColors( IRenderHelper renderer, boolean hasChan, boolean hasPower )
public void setColors( ModelGenerator renderer, boolean hasChan, boolean hasPower )
{
this.hasRedstone = ( this.clientFlags & this.REDSTONE_FLAG ) == this.REDSTONE_FLAG;
super.setColors( renderer, hasChan && this.hasRedstone, hasPower && this.hasRedstone );
@@ -88,7 +88,7 @@ public class PartToggleBus extends PartBasicState
}
@Override
public TextureAtlasSprite getBreakingTexture( IRenderHelper renderer )
public TextureAtlasSprite getBreakingTexture( ModelGenerator renderer )
{
return renderer.getIcon( is ).getAtlas();
}
@@ -120,7 +120,7 @@ public class PartToggleBus extends PartBasicState
@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 );
@@ -145,7 +145,7 @@ public class PartToggleBus extends PartBasicState
@Override
@SideOnly( Side.CLIENT )
public void renderStatic( BlockPos pos, IPartRenderHelper rh, IRenderHelper renderer )
public void renderStatic( BlockPos pos, IPartRenderHelper rh, ModelGenerator renderer )
{
rh.setTexture( renderer.getIcon( is ) );
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 );
src/main/java/appeng/parts/p2p/PartP2PTunnel.java
+5 -5
View File
@@ -46,7 +46,7 @@ import appeng.api.parts.IPartItem;
import appeng.api.parts.IPartRenderHelper;
import appeng.api.parts.PartItemStack;
import appeng.api.util.AEPartLocation;
import appeng.client.render.IRenderHelper;
import appeng.client.render.ModelGenerator;
import appeng.client.texture.CableBusTextures;
import appeng.client.texture.IAESprite;
import appeng.core.AEConfig;
@@ -123,7 +123,7 @@ public abstract class PartP2PTunnel<T extends PartP2PTunnel> extends PartBasicSt
@Override
@SideOnly( Side.CLIENT )
public void renderInventory( IPartRenderHelper rh, IRenderHelper renderer )
public void renderInventory( IPartRenderHelper rh, ModelGenerator renderer )
{
rh.setTexture( this.getTypeTexture(renderer) );
@@ -140,7 +140,7 @@ public abstract class PartP2PTunnel<T extends PartP2PTunnel> extends PartBasicSt
* @param renderer
* @return If enabled it returns the icon of an AE quartz block, else vanilla quartz block icon
*/
protected IAESprite getTypeTexture(IRenderHelper renderer )
protected IAESprite getTypeTexture(ModelGenerator renderer )
{
final Optional<Block> maybeBlock = AEApi.instance().definitions().blocks().quartz().maybeBlock();
if( maybeBlock.isPresent() )
@@ -155,7 +155,7 @@ public abstract class PartP2PTunnel<T extends PartP2PTunnel> extends PartBasicSt
@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.getTypeTexture(renderer) );
@@ -440,7 +440,7 @@ public abstract class PartP2PTunnel<T extends PartP2PTunnel> extends PartBasicSt
@Override
@SideOnly( Side.CLIENT )
public TextureAtlasSprite getBreakingTexture( IRenderHelper renderer )
public TextureAtlasSprite getBreakingTexture( ModelGenerator renderer )
{
return CableBusTextures.BlockP2PTunnel2.getIcon().getAtlas();
}
src/main/java/appeng/parts/reporting/AbstractPartDisplay.java
+3 -3
View File
@@ -26,7 +26,7 @@ import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import appeng.api.parts.IPartRenderHelper;
import appeng.client.render.IRenderHelper;
import appeng.client.render.ModelGenerator;
import appeng.client.texture.CableBusTextures;
import appeng.client.texture.IAESprite;
@@ -52,7 +52,7 @@ public abstract class AbstractPartDisplay extends AbstractPartReporting
@Override
@SideOnly( Side.CLIENT )
public void renderInventory( IPartRenderHelper rh, IRenderHelper renderer )
public void renderInventory( IPartRenderHelper rh, ModelGenerator renderer )
{
rh.setBounds( 2, 2, 14, 14, 14, 16 );
@@ -77,7 +77,7 @@ public abstract class AbstractPartDisplay extends AbstractPartReporting
@Override
@SideOnly( Side.CLIENT )
public void renderStatic( BlockPos pos, IPartRenderHelper rh, IRenderHelper renderer )
public void renderStatic( BlockPos pos, IPartRenderHelper rh, ModelGenerator renderer )
{
final IAESprite sideTexture = CableBusTextures.PartMonitorSides.getIcon();
final IAESprite backTexture = CableBusTextures.PartMonitorBack.getIcon();
src/main/java/appeng/parts/reporting/AbstractPartMonitor.java
+2 -2
View File
@@ -53,7 +53,7 @@ import appeng.api.storage.data.IAEStack;
import appeng.api.storage.data.IItemList;
import appeng.api.util.AEPartLocation;
import appeng.client.ClientHelper;
import appeng.client.render.IRenderHelper;
import appeng.client.render.ModelGenerator;
import appeng.core.AELog;
import appeng.core.localization.PlayerMessages;
import appeng.helpers.Reflected;
@@ -257,7 +257,7 @@ public abstract class AbstractPartMonitor extends AbstractPartDisplay implements
@Override
@SideOnly( Side.CLIENT )
public void renderDynamic( double x, double y, double z, IPartRenderHelper rh, IRenderHelper renderer )
public void renderDynamic( double x, double y, double z, IPartRenderHelper rh, ModelGenerator renderer )
{
if( this.dspList == null )
{
src/main/java/appeng/parts/reporting/AbstractPartPanel.java
+3 -3
View File
@@ -27,7 +27,7 @@ import net.minecraftforge.fml.relauncher.SideOnly;
import appeng.api.parts.IPartRenderHelper;
import appeng.api.util.AEColor;
import appeng.client.render.IRenderHelper;
import appeng.client.render.ModelGenerator;
import appeng.client.texture.CableBusTextures;
import appeng.client.texture.IAESprite;
@@ -79,7 +79,7 @@ public abstract class AbstractPartPanel extends AbstractPartReporting
@Override
@SideOnly( Side.CLIENT )
public void renderInventory( IPartRenderHelper rh, IRenderHelper renderer )
public void renderInventory( IPartRenderHelper rh, ModelGenerator renderer )
{
rh.setBounds( 2, 2, 14, 14, 14, 16 );
@@ -98,7 +98,7 @@ public abstract class AbstractPartPanel extends AbstractPartReporting
@Override
@SideOnly( Side.CLIENT )
public void renderStatic( BlockPos pos, IPartRenderHelper rh, IRenderHelper renderer )
public void renderStatic( BlockPos pos, IPartRenderHelper rh, ModelGenerator renderer )
{
final IAESprite sideTexture = CableBusTextures.PartMonitorSides.getIcon();
final IAESprite backTexture = CableBusTextures.PartMonitorBack.getIcon();