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/client/render/blocks/RenderBlockAssembler.java
+5 -5
View File
@@ -37,7 +37,7 @@ import appeng.api.util.IOrientable;
import appeng.block.crafting.BlockMolecularAssembler;
import appeng.client.render.BaseBlockRender;
import appeng.client.render.BusRenderer;
import appeng.client.render.IRenderHelper;
import appeng.client.render.ModelGenerator;
import appeng.client.texture.ExtraBlockTextures;
import appeng.client.texture.IAESprite;
import appeng.client.texture.TaughtIcon;
@@ -55,7 +55,7 @@ public class RenderBlockAssembler extends BaseBlockRender<BlockMolecularAssemble
}
@Override
public void renderInventory( BlockMolecularAssembler blk, ItemStack is, IRenderHelper renderer, ItemRenderType type, Object[] obj )
public void renderInventory( BlockMolecularAssembler blk, ItemStack is, ModelGenerator renderer, ItemRenderType type, Object[] obj )
{
renderer.setOverrideBlockTexture( renderer.getIcon( blk.getStateFromMeta( is.getMetadata() ) )[0] );
@@ -102,7 +102,7 @@ public class RenderBlockAssembler extends BaseBlockRender<BlockMolecularAssemble
}
@Override
public boolean renderInWorld( BlockMolecularAssembler block, IBlockAccess world, BlockPos pos, IRenderHelper renderer )
public boolean renderInWorld( BlockMolecularAssembler block, IBlockAccess world, BlockPos pos, ModelGenerator renderer )
{
BlockMolecularAssembler blk = block;
TileMolecularAssembler tma = blk.getTileEntity( world, pos );
@@ -194,7 +194,7 @@ public class RenderBlockAssembler extends BaseBlockRender<BlockMolecularAssemble
return true;
}
public void renderCableAt( double thickness, IBlockAccess world, BlockPos pos, BlockMolecularAssembler block, IRenderHelper renderer, double pull, boolean covered )
public void renderCableAt( double thickness, IBlockAccess world, BlockPos pos, BlockMolecularAssembler block, ModelGenerator renderer, double pull, boolean covered )
{
IAESprite texture = null;
@@ -243,7 +243,7 @@ public class RenderBlockAssembler extends BaseBlockRender<BlockMolecularAssemble
block.getRendererInstance().setTemporaryRenderIcon( null );
}
IAESprite getConnectedCable( IBlockAccess world, BlockPos pos, EnumFacing side, boolean covered,IRenderHelper renderer )
IAESprite getConnectedCable( IBlockAccess world, BlockPos pos, EnumFacing side, boolean covered,ModelGenerator renderer )
{
final int tileYPos = pos.getY() + side.getFrontOffsetY();
if( -1 < tileYPos && tileYPos < 256 )
src/main/java/appeng/client/render/blocks/RenderBlockCharger.java
+4 -4
View File
@@ -38,7 +38,7 @@ import appeng.api.util.AEPartLocation;
import appeng.api.util.IOrientable;
import appeng.block.misc.BlockCharger;
import appeng.client.render.BaseBlockRender;
import appeng.client.render.IRenderHelper;
import appeng.client.render.ModelGenerator;
import appeng.client.texture.ExtraBlockTextures;
import appeng.core.AELog;
import appeng.tile.misc.TileCharger;
@@ -54,7 +54,7 @@ public class RenderBlockCharger extends BaseBlockRender<BlockCharger, TileCharge
}
@Override
public void renderInventory( BlockCharger blk, ItemStack is, IRenderHelper renderer, ItemRenderType type, Object[] obj )
public void renderInventory( BlockCharger blk, ItemStack is, ModelGenerator renderer, ItemRenderType type, Object[] obj )
{
renderer.renderAllFaces = true;
this.setInvRenderBounds( renderer, 6, 1, 0, 10, 15, 2 );
@@ -83,7 +83,7 @@ public class RenderBlockCharger extends BaseBlockRender<BlockCharger, TileCharge
}
@Override
public boolean renderInWorld( BlockCharger block, IBlockAccess world, BlockPos pos, IRenderHelper renderer )
public boolean renderInWorld( BlockCharger block, IBlockAccess world, BlockPos pos, ModelGenerator renderer )
{
this.preRenderInWorld( block, world, pos, renderer );
@@ -125,7 +125,7 @@ public class RenderBlockCharger extends BaseBlockRender<BlockCharger, TileCharge
}
@Override
public void renderTile( BlockCharger block, TileCharger tile, WorldRenderer tess, double x, double y, double z, float f, IRenderHelper renderer )
public void renderTile( BlockCharger block, TileCharger tile, WorldRenderer tess, double x, double y, double z, float f, ModelGenerator renderer )
{
ItemStack sis = null;
if( tile instanceof IInventory )
src/main/java/appeng/client/render/blocks/RenderBlockController.java
+2 -2
View File
@@ -26,7 +26,7 @@ import net.minecraft.world.IBlockAccess;
import appeng.block.networking.BlockController;
import appeng.block.networking.BlockController.ControllerBlockState;
import appeng.client.render.BaseBlockRender;
import appeng.client.render.IRenderHelper;
import appeng.client.render.ModelGenerator;
import appeng.client.texture.ExtraBlockTextures;
import appeng.tile.networking.TileController;
@@ -40,7 +40,7 @@ public class RenderBlockController extends BaseBlockRender<BlockController, Tile
}
@Override
public boolean renderInWorld( BlockController blk, IBlockAccess world, BlockPos pos, IRenderHelper renderer )
public boolean renderInWorld( BlockController blk, IBlockAccess world, BlockPos pos, ModelGenerator renderer )
{
boolean xx = this.getTileEntity( world, pos.offset( EnumFacing.WEST ) ) instanceof TileController && this.getTileEntity( world, pos.offset( EnumFacing.EAST ) ) instanceof TileController;
src/main/java/appeng/client/render/blocks/RenderBlockCraftingCPU.java
+4 -4
View File
@@ -36,7 +36,7 @@ import appeng.block.crafting.BlockCraftingUnit;
import appeng.client.render.BaseBlockRender;
import appeng.client.render.BusRenderHelper;
import appeng.client.render.BusRenderer;
import appeng.client.render.IRenderHelper;
import appeng.client.render.ModelGenerator;
import appeng.client.texture.ExtraBlockTextures;
import appeng.client.texture.IAESprite;
import appeng.tile.crafting.TileCraftingMonitorTile;
@@ -57,7 +57,7 @@ public class RenderBlockCraftingCPU<B extends BlockCraftingUnit, T extends TileC
}
@Override
public boolean renderInWorld( B blk, IBlockAccess w, BlockPos pos, IRenderHelper renderer )
public boolean renderInWorld( B blk, IBlockAccess w, BlockPos pos, ModelGenerator renderer )
{
IAESprite theIcon = null;
boolean formed = false;
@@ -160,7 +160,7 @@ public class RenderBlockCraftingCPU<B extends BlockCraftingUnit, T extends TileC
}
}
private void renderCorner( BusRenderHelper i, IRenderHelper renderer, IBlockAccess w, BlockPos pos, EnumFacing up, EnumFacing east, EnumFacing south )
private void renderCorner( BusRenderHelper i, ModelGenerator renderer, IBlockAccess w, BlockPos pos, EnumFacing up, EnumFacing east, EnumFacing south )
{
if( this.isConnected( w, pos, up ) )
{
@@ -194,7 +194,7 @@ public class RenderBlockCraftingCPU<B extends BlockCraftingUnit, T extends TileC
return def;
}
private void handleSide( B blk, int meta, BlockPos pos, BusRenderHelper i, IRenderHelper renderer, IAESprite color, boolean emitsLight, boolean isMonitor, EnumFacing side, IBlockAccess w )
private void handleSide( B blk, int meta, BlockPos pos, BusRenderHelper i, ModelGenerator renderer, IAESprite color, boolean emitsLight, boolean isMonitor, EnumFacing side, IBlockAccess w )
{
if( this.isConnected( w, pos, side ) )
{
src/main/java/appeng/client/render/blocks/RenderBlockCraftingCPUMonitor.java
+2 -2
View File
@@ -33,7 +33,7 @@ import org.lwjgl.opengl.GL12;
import appeng.api.storage.data.IAEItemStack;
import appeng.block.crafting.BlockCraftingMonitor;
import appeng.client.ClientHelper;
import appeng.client.render.IRenderHelper;
import appeng.client.render.ModelGenerator;
import appeng.core.AELog;
import appeng.tile.crafting.TileCraftingMonitorTile;
import appeng.util.IWideReadableNumberConverter;
@@ -57,7 +57,7 @@ public class RenderBlockCraftingCPUMonitor extends RenderBlockCraftingCPU<BlockC
}
@Override
public void renderTile( BlockCraftingMonitor block, TileCraftingMonitorTile tile, WorldRenderer tess, double x, double y, double z, float f, IRenderHelper renderer )
public void renderTile( BlockCraftingMonitor block, TileCraftingMonitorTile tile, WorldRenderer tess, double x, double y, double z, float f, ModelGenerator renderer )
{
if( tile instanceof TileCraftingMonitorTile )
{
src/main/java/appeng/client/render/blocks/RenderBlockCrank.java
+4 -5
View File
@@ -21,7 +21,6 @@ package appeng.client.render.blocks;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.RenderHelper;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.client.renderer.WorldRenderer;
import net.minecraft.client.renderer.entity.RenderItem;
import net.minecraft.client.renderer.texture.TextureMap;
@@ -35,7 +34,7 @@ import org.lwjgl.opengl.GL11;
import appeng.block.grindstone.BlockCrank;
import appeng.client.render.BaseBlockRender;
import appeng.client.render.IRenderHelper;
import appeng.client.render.ModelGenerator;
import appeng.tile.grindstone.TileCrank;
@@ -48,7 +47,7 @@ public class RenderBlockCrank extends BaseBlockRender<BlockCrank, TileCrank>
}
@Override
public void renderInventory( BlockCrank blk, ItemStack is, IRenderHelper renderer, ItemRenderType type, Object[] obj )
public void renderInventory( BlockCrank blk, ItemStack is, ModelGenerator renderer, ItemRenderType type, Object[] obj )
{
renderer.renderAllFaces = true;
@@ -62,13 +61,13 @@ public class RenderBlockCrank extends BaseBlockRender<BlockCrank, TileCrank>
}
@Override
public boolean renderInWorld( BlockCrank imb, IBlockAccess world, BlockPos pos, IRenderHelper renderer )
public boolean renderInWorld( BlockCrank imb, IBlockAccess world, BlockPos pos, ModelGenerator renderer )
{
return true;
}
@Override
public void renderTile( BlockCrank blk, TileCrank tile, WorldRenderer tess, double x, double y, double z, float f, IRenderHelper renderBlocks )
public void renderTile( BlockCrank blk, TileCrank tile, WorldRenderer tess, double x, double y, double z, float f, ModelGenerator renderBlocks )
{
TileCrank tc = tile;
if( tc.getUp() == null || tc.getUp() == null )
src/main/java/appeng/client/render/blocks/RenderBlockEnergyCube.java
+3 -3
View File
@@ -26,7 +26,7 @@ import net.minecraftforge.client.IItemRenderer.ItemRenderType;
import appeng.api.implementations.items.IAEItemPowerStorage;
import appeng.block.networking.BlockEnergyCell;
import appeng.client.render.BaseBlockRender;
import appeng.client.render.IRenderHelper;
import appeng.client.render.ModelGenerator;
import appeng.tile.networking.TileEnergyCell;
@@ -39,7 +39,7 @@ public class RenderBlockEnergyCube extends BaseBlockRender<BlockEnergyCell, Tile
}
@Override
public void renderInventory( BlockEnergyCell blk, ItemStack is, IRenderHelper renderer, ItemRenderType type, Object[] obj )
public void renderInventory( BlockEnergyCell blk, ItemStack is, ModelGenerator renderer, ItemRenderType type, Object[] obj )
{
IAEItemPowerStorage myItem = (IAEItemPowerStorage) is.getItem();
double internalCurrentPower = myItem.getAECurrentPower( is );
@@ -62,7 +62,7 @@ public class RenderBlockEnergyCube extends BaseBlockRender<BlockEnergyCell, Tile
}
@Override
public boolean renderInWorld( BlockEnergyCell blk, IBlockAccess world, BlockPos pos, IRenderHelper renderer )
public boolean renderInWorld( BlockEnergyCell blk, IBlockAccess world, BlockPos pos, ModelGenerator renderer )
{
renderer.overrideBlockTexture = renderer.getIcon( world.getBlockState( pos ) )[0];// blk.getIcon( 0, meta );
boolean out = renderer.renderStandardBlock( blk, pos );
src/main/java/appeng/client/render/blocks/RenderBlockInscriber.java
+5 -5
View File
@@ -42,7 +42,7 @@ import appeng.api.util.IOrientable;
import appeng.block.AEBaseBlock;
import appeng.block.misc.BlockInscriber;
import appeng.client.render.BaseBlockRender;
import appeng.client.render.IRenderHelper;
import appeng.client.render.ModelGenerator;
import appeng.client.texture.ExtraBlockTextures;
import appeng.client.texture.IAESprite;
import appeng.core.AELog;
@@ -66,7 +66,7 @@ public class RenderBlockInscriber extends BaseBlockRender<BlockInscriber, TileIn
}
@Override
public void renderInventory( BlockInscriber blk, ItemStack is, IRenderHelper renderer, ItemRenderType type, Object[] obj )
public void renderInventory( BlockInscriber blk, ItemStack is, ModelGenerator renderer, ItemRenderType type, Object[] obj )
{
renderer.renderAllFaces = true;
this.setInvRenderBounds( renderer, 6, 1, 0, 10, 15, 2 );
@@ -105,7 +105,7 @@ public class RenderBlockInscriber extends BaseBlockRender<BlockInscriber, TileIn
}
@Override
public boolean renderInWorld( BlockInscriber block, IBlockAccess world, BlockPos pos, IRenderHelper renderer )
public boolean renderInWorld( BlockInscriber block, IBlockAccess world, BlockPos pos, ModelGenerator renderer )
{
this.preRenderInWorld( block, world, pos, renderer );
@@ -150,7 +150,7 @@ public class RenderBlockInscriber extends BaseBlockRender<BlockInscriber, TileIn
}
@Override
public void renderTile( BlockInscriber block, TileInscriber tile, WorldRenderer tess, double x, double y, double z, float f, IRenderHelper renderer )
public void renderTile( BlockInscriber block, TileInscriber tile, WorldRenderer tess, double x, double y, double z, float f, ModelGenerator renderer )
{
TileInscriber inv = tile;
@@ -264,7 +264,7 @@ public class RenderBlockInscriber extends BaseBlockRender<BlockInscriber, TileIn
}
}
public void renderItem( ItemStack sis, float o, AEBaseBlock block, AEBaseTile tile, WorldRenderer tess, double x, double y, double z, float f, IRenderHelper renderer )
public void renderItem( ItemStack sis, float o, AEBaseBlock block, AEBaseTile tile, WorldRenderer tess, double x, double y, double z, float f, ModelGenerator renderer )
{
if( sis != null )
{
src/main/java/appeng/client/render/blocks/RenderBlockInterface.java
+2 -2
View File
@@ -24,7 +24,7 @@ import net.minecraft.world.IBlockAccess;
import appeng.block.misc.BlockInterface;
import appeng.client.render.BaseBlockRender;
import appeng.client.render.BlockRenderInfo;
import appeng.client.render.IRenderHelper;
import appeng.client.render.ModelGenerator;
import appeng.client.texture.ExtraBlockTextures;
import appeng.client.texture.IAESprite;
import appeng.tile.misc.TileInterface;
@@ -39,7 +39,7 @@ public class RenderBlockInterface extends BaseBlockRender<BlockInterface, TileIn
}
@Override
public boolean renderInWorld( BlockInterface block, IBlockAccess world, BlockPos pos, IRenderHelper renderer )
public boolean renderInWorld( BlockInterface block, IBlockAccess world, BlockPos pos, ModelGenerator renderer )
{
TileInterface ti = block.getTileEntity( world, pos );
BlockRenderInfo info = block.getRendererInstance();
src/main/java/appeng/client/render/blocks/RenderBlockPaint.java
+3 -3
View File
@@ -28,7 +28,7 @@ import net.minecraft.world.IBlockAccess;
import net.minecraftforge.client.IItemRenderer.ItemRenderType;
import appeng.block.misc.BlockPaint;
import appeng.client.render.BaseBlockRender;
import appeng.client.render.IRenderHelper;
import appeng.client.render.ModelGenerator;
import appeng.client.texture.ExtraBlockTextures;
import appeng.client.texture.IAESprite;
import appeng.helpers.Splotch;
@@ -44,13 +44,13 @@ public class RenderBlockPaint extends BaseBlockRender<BlockPaint, TilePaint>
}
@Override
public void renderInventory( BlockPaint block, ItemStack is, IRenderHelper renderer, ItemRenderType type, Object[] obj )
public void renderInventory( BlockPaint block, ItemStack is, ModelGenerator renderer, ItemRenderType type, Object[] obj )
{
}
@Override
public boolean renderInWorld( BlockPaint imb, IBlockAccess world, BlockPos pos, IRenderHelper tess )
public boolean renderInWorld( BlockPaint imb, IBlockAccess world, BlockPos pos, ModelGenerator tess )
{
TilePaint tp = imb.getTileEntity( world, pos );
boolean out = false;
src/main/java/appeng/client/render/blocks/RenderBlockQuartzAccelerator.java
+2 -2
View File
@@ -24,7 +24,7 @@ import net.minecraft.util.BlockPos;
import net.minecraft.world.IBlockAccess;
import appeng.block.misc.BlockQuartzGrowthAccelerator;
import appeng.client.render.BaseBlockRender;
import appeng.client.render.IRenderHelper;
import appeng.client.render.ModelGenerator;
import appeng.client.texture.ExtraBlockTextures;
import appeng.client.texture.IAESprite;
import appeng.tile.misc.TileQuartzGrowthAccelerator;
@@ -39,7 +39,7 @@ public class RenderBlockQuartzAccelerator extends BaseBlockRender<BlockQuartzGro
}
@Override
public boolean renderInWorld( BlockQuartzGrowthAccelerator blk, IBlockAccess world, BlockPos pos, IRenderHelper renderer )
public boolean renderInWorld( BlockQuartzGrowthAccelerator blk, IBlockAccess world, BlockPos pos, ModelGenerator renderer )
{
TileEntity te = world.getTileEntity( pos );
if( te instanceof TileQuartzGrowthAccelerator )
src/main/java/appeng/client/render/blocks/RenderBlockSkyChest.java
+4 -4
View File
@@ -35,7 +35,7 @@ import org.lwjgl.opengl.GL12;
import appeng.block.storage.BlockSkyChest;
import appeng.block.storage.BlockSkyChest.SkyChestType;
import appeng.client.render.BaseBlockRender;
import appeng.client.render.IRenderHelper;
import appeng.client.render.ModelGenerator;
import appeng.tile.storage.TileSkyChest;
@@ -54,7 +54,7 @@ public class RenderBlockSkyChest extends BaseBlockRender<BlockSkyChest, TileSkyC
}
@Override
public void renderInventory( BlockSkyChest blk, ItemStack is, IRenderHelper renderer, ItemRenderType type, Object[] obj )
public void renderInventory( BlockSkyChest blk, ItemStack is, ModelGenerator renderer, ItemRenderType type, Object[] obj )
{
//GL11.glEnable( GL12.GL_RESCALE_NORMAL );
//GL11.glColor4f( 1.0F, 1.0F, 1.0F, 1.0F );
@@ -78,13 +78,13 @@ public class RenderBlockSkyChest extends BaseBlockRender<BlockSkyChest, TileSkyC
}
@Override
public boolean renderInWorld( BlockSkyChest blk, IBlockAccess world, BlockPos pos, IRenderHelper renderer )
public boolean renderInWorld( BlockSkyChest blk, IBlockAccess world, BlockPos pos, ModelGenerator renderer )
{
return true;
}
@Override
public void renderTile( BlockSkyChest block, TileSkyChest tile, WorldRenderer tess, double x, double y, double z, float partialTick, IRenderHelper renderer )
public void renderTile( BlockSkyChest block, TileSkyChest tile, WorldRenderer tess, double x, double y, double z, float partialTick, ModelGenerator renderer )
{
if( !( tile instanceof TileSkyChest ) )
{
src/main/java/appeng/client/render/blocks/RenderBlockSkyCompass.java
+4 -4
View File
@@ -32,7 +32,7 @@ import org.lwjgl.opengl.GL11;
import appeng.block.misc.BlockSkyCompass;
import appeng.client.render.BaseBlockRender;
import appeng.client.render.IRenderHelper;
import appeng.client.render.ModelGenerator;
import appeng.client.render.model.ModelCompass;
import appeng.hooks.CompassManager;
import appeng.hooks.CompassResult;
@@ -51,7 +51,7 @@ public class RenderBlockSkyCompass extends BaseBlockRender<BlockSkyCompass, Tile
}
@Override
public void renderInventory( BlockSkyCompass blk, ItemStack is, IRenderHelper renderer, ItemRenderType type, Object[] obj )
public void renderInventory( BlockSkyCompass blk, ItemStack is, ModelGenerator renderer, ItemRenderType type, Object[] obj )
{
/*
if( type == ItemRenderType.INVENTORY )
@@ -173,13 +173,13 @@ public class RenderBlockSkyCompass extends BaseBlockRender<BlockSkyCompass, Tile
}
@Override
public boolean renderInWorld( BlockSkyCompass blk, IBlockAccess world, BlockPos pos, IRenderHelper renderer )
public boolean renderInWorld( BlockSkyCompass blk, IBlockAccess world, BlockPos pos, ModelGenerator renderer )
{
return true;
}
@Override
public void renderTile( BlockSkyCompass block, TileSkyCompass tile, WorldRenderer tess, double x, double y, double z, float partialTick, IRenderHelper renderer )
public void renderTile( BlockSkyCompass block, TileSkyCompass tile, WorldRenderer tess, double x, double y, double z, float partialTick, ModelGenerator renderer )
{
if( !( tile instanceof TileSkyCompass ) )
{
src/main/java/appeng/client/render/blocks/RenderBlockWireless.java
+4 -4
View File
@@ -31,7 +31,7 @@ import appeng.api.util.AEPartLocation;
import appeng.block.networking.BlockWireless;
import appeng.client.render.BaseBlockRender;
import appeng.client.render.BlockRenderInfo;
import appeng.client.render.IRenderHelper;
import appeng.client.render.ModelGenerator;
import appeng.client.texture.CableBusTextures;
import appeng.client.texture.ExtraBlockTextures;
import appeng.client.texture.IAESprite;
@@ -54,7 +54,7 @@ public class RenderBlockWireless extends BaseBlockRender<BlockWireless, TileWire
}
@Override
public void renderInventory( BlockWireless blk, ItemStack is, IRenderHelper renderer, ItemRenderType type, Object[] obj )
public void renderInventory( BlockWireless blk, ItemStack is, ModelGenerator renderer, ItemRenderType type, Object[] obj )
{
this.blk = blk;
center = new BlockPos(0,0,0);
@@ -101,7 +101,7 @@ public class RenderBlockWireless extends BaseBlockRender<BlockWireless, TileWire
}
@Override
public boolean renderInWorld( BlockWireless blk, IBlockAccess world, BlockPos pos, IRenderHelper renderer )
public boolean renderInWorld( BlockWireless blk, IBlockAccess world, BlockPos pos, ModelGenerator renderer )
{
TileWireless tw = blk.getTileEntity( world, pos );
this.blk = blk;
@@ -208,7 +208,7 @@ public class RenderBlockWireless extends BaseBlockRender<BlockWireless, TileWire
return true;
}
private void renderTorchAtAngle( IRenderHelper renderer, EnumFacing x, EnumFacing y, EnumFacing z )
private void renderTorchAtAngle( ModelGenerator renderer, EnumFacing x, EnumFacing y, EnumFacing z )
{
IAESprite r = ( this.hasChan ? CableBusTextures.BlockWirelessOn.getIcon() : renderer.getIcon( blk.getDefaultState() )[0] );
IAESprite sides = new OffsetIcon( r, 0.0f, -2.0f );
src/main/java/appeng/client/render/blocks/RenderDrive.java
+3 -3
View File
@@ -29,7 +29,7 @@ import net.minecraftforge.client.IItemRenderer.ItemRenderType;
import appeng.api.util.AEPartLocation;
import appeng.block.storage.BlockDrive;
import appeng.client.render.BaseBlockRender;
import appeng.client.render.IRenderHelper;
import appeng.client.render.ModelGenerator;
import appeng.client.texture.ExtraBlockTextures;
import appeng.client.texture.IAESprite;
import appeng.tile.storage.TileDrive;
@@ -45,7 +45,7 @@ public class RenderDrive extends BaseBlockRender<BlockDrive, TileDrive>
}
@Override
public void renderInventory( BlockDrive block, ItemStack is, IRenderHelper renderer, ItemRenderType type, Object[] obj )
public void renderInventory( BlockDrive block, ItemStack is, ModelGenerator renderer, ItemRenderType type, Object[] obj )
{
renderer.overrideBlockTexture = ExtraBlockTextures.White.getIcon();
this.renderInvBlock( EnumSet.of( AEPartLocation.SOUTH ), block, is, 0x000000, renderer );
@@ -55,7 +55,7 @@ public class RenderDrive extends BaseBlockRender<BlockDrive, TileDrive>
}
@Override
public boolean renderInWorld( BlockDrive imb, IBlockAccess world, BlockPos pos, IRenderHelper renderer )
public boolean renderInWorld( BlockDrive imb, IBlockAccess world, BlockPos pos, ModelGenerator renderer )
{
TileDrive sp = imb.getTileEntity( world, pos );
renderer.setRenderBounds( 0, 0, 0, 1, 1, 1 );
src/main/java/appeng/client/render/blocks/RenderMEChest.java
+3 -3
View File
@@ -32,7 +32,7 @@ import appeng.api.util.AEColor;
import appeng.api.util.AEPartLocation;
import appeng.block.storage.BlockChest;
import appeng.client.render.BaseBlockRender;
import appeng.client.render.IRenderHelper;
import appeng.client.render.ModelGenerator;
import appeng.client.texture.ExtraBlockTextures;
import appeng.client.texture.FlippableIcon;
import appeng.client.texture.IAESprite;
@@ -50,7 +50,7 @@ public class RenderMEChest extends BaseBlockRender<BlockChest, TileChest>
}
@Override
public void renderInventory( BlockChest block, ItemStack is, IRenderHelper renderer, ItemRenderType type, Object[] obj )
public void renderInventory( BlockChest block, ItemStack is, ModelGenerator renderer, ItemRenderType type, Object[] obj )
{
renderer.setBrightness( 0 );
renderer.overrideBlockTexture = ExtraBlockTextures.White.getIcon();
@@ -64,7 +64,7 @@ public class RenderMEChest extends BaseBlockRender<BlockChest, TileChest>
}
@Override
public boolean renderInWorld( BlockChest imb, IBlockAccess world, BlockPos pos, IRenderHelper renderer )
public boolean renderInWorld( BlockChest imb, IBlockAccess world, BlockPos pos, ModelGenerator renderer )
{
TileChest sp = imb.getTileEntity( world, pos );
renderer.setRenderBounds( 0, 0, 0, 1, 1, 1 );
src/main/java/appeng/client/render/blocks/RenderNull.java
+3 -3
View File
@@ -25,7 +25,7 @@ import net.minecraft.world.IBlockAccess;
import net.minecraftforge.client.IItemRenderer.ItemRenderType;
import appeng.block.AEBaseBlock;
import appeng.client.render.BaseBlockRender;
import appeng.client.render.IRenderHelper;
import appeng.client.render.ModelGenerator;
import appeng.tile.AEBaseTile;
@@ -38,13 +38,13 @@ public class RenderNull extends BaseBlockRender<AEBaseBlock, AEBaseTile>
}
@Override
public void renderInventory( AEBaseBlock block, ItemStack is, IRenderHelper renderer, ItemRenderType type, Object[] obj )
public void renderInventory( AEBaseBlock block, ItemStack is, ModelGenerator renderer, ItemRenderType type, Object[] obj )
{
}
@Override
public boolean renderInWorld( AEBaseBlock block, IBlockAccess world, BlockPos pos, IRenderHelper renderer )
public boolean renderInWorld( AEBaseBlock block, IBlockAccess world, BlockPos pos, ModelGenerator renderer )
{
return true;
}
src/main/java/appeng/client/render/blocks/RenderQNB.java
+4 -4
View File
@@ -37,7 +37,7 @@ import appeng.api.util.AEColor;
import appeng.api.util.AEPartLocation;
import appeng.block.qnb.BlockQuantumBase;
import appeng.client.render.BaseBlockRender;
import appeng.client.render.IRenderHelper;
import appeng.client.render.ModelGenerator;
import appeng.client.texture.ExtraBlockTextures;
import appeng.client.texture.IAESprite;
import appeng.tile.qnb.TileQuantumBridge;
@@ -47,7 +47,7 @@ public class RenderQNB extends BaseBlockRender<BlockQuantumBase, TileQuantumBrid
{
@Override
public void renderInventory( BlockQuantumBase block, ItemStack item, IRenderHelper renderer, ItemRenderType type, Object[] obj )
public void renderInventory( BlockQuantumBase block, ItemStack item, ModelGenerator renderer, ItemRenderType type, Object[] obj )
{
float minPx = 2.0f / 16.0f;
float maxPx = 14.0f / 16.0f;
@@ -57,7 +57,7 @@ public class RenderQNB extends BaseBlockRender<BlockQuantumBase, TileQuantumBrid
}
@Override
public boolean renderInWorld( BlockQuantumBase block, IBlockAccess world, BlockPos pos, IRenderHelper renderer )
public boolean renderInWorld( BlockQuantumBase block, IBlockAccess world, BlockPos pos, ModelGenerator renderer )
{
TileQuantumBridge tqb = block.getTileEntity( world, pos );
if( tqb == null )
@@ -161,7 +161,7 @@ public class RenderQNB extends BaseBlockRender<BlockQuantumBase, TileQuantumBrid
return true;
}
private void renderCableAt( double thickness, IBlockAccess world, BlockPos pos, BlockQuantumBase block, IRenderHelper renderer, IAESprite texture, double pull, Collection<AEPartLocation> connections )
private void renderCableAt( double thickness, IBlockAccess world, BlockPos pos, BlockQuantumBase block, ModelGenerator renderer, IAESprite texture, double pull, Collection<AEPartLocation> connections )
{
block.getRendererInstance().setTemporaryRenderIcon( texture );
src/main/java/appeng/client/render/blocks/RenderQuartzGlass.java
+4 -4
View File
@@ -29,7 +29,7 @@ import appeng.api.AEApi;
import appeng.api.util.AEPartLocation;
import appeng.block.solids.BlockQuartzGlass;
import appeng.client.render.BaseBlockRender;
import appeng.client.render.IRenderHelper;
import appeng.client.render.ModelGenerator;
import appeng.client.texture.ExtraBlockTextures;
import appeng.client.texture.OffsetIcon;
import appeng.tile.AEBaseTile;
@@ -58,7 +58,7 @@ public class RenderQuartzGlass extends BaseBlockRender<BlockQuartzGlass, AEBaseT
}
@Override
public void renderInventory( BlockQuartzGlass block, ItemStack is, IRenderHelper renderer, ItemRenderType type, Object[] obj )
public void renderInventory( BlockQuartzGlass block, ItemStack is, ModelGenerator renderer, ItemRenderType type, Object[] obj )
{
renderer.overrideBlockTexture = ExtraBlockTextures.GlassFrame.getIcon();
super.renderInventory( block, is, renderer, type, obj );
@@ -67,7 +67,7 @@ public class RenderQuartzGlass extends BaseBlockRender<BlockQuartzGlass, AEBaseT
}
@Override
public boolean renderInWorld( BlockQuartzGlass imb, IBlockAccess world, BlockPos pos, IRenderHelper renderer )
public boolean renderInWorld( BlockQuartzGlass imb, IBlockAccess world, BlockPos pos, ModelGenerator renderer )
{
renderer.setRenderBounds( 0, 0, 0, 1, 1, 1 );
@@ -130,7 +130,7 @@ public class RenderQuartzGlass extends BaseBlockRender<BlockQuartzGlass, AEBaseT
return result;
}
private void renderEdge( BlockQuartzGlass imb, IBlockAccess world, BlockPos pos, IRenderHelper renderer, AEPartLocation side, AEPartLocation direction )
private void renderEdge( BlockQuartzGlass imb, IBlockAccess world, BlockPos pos, ModelGenerator renderer, AEPartLocation side, AEPartLocation direction )
{
if( !this.isFlush( imb, world, pos.getX() + side.xOffset, pos.getY() + side.yOffset, pos.getZ() + side.zOffset ) )
{
src/main/java/appeng/client/render/blocks/RenderQuartzOre.java
+3 -3
View File
@@ -25,7 +25,7 @@ import net.minecraft.world.IBlockAccess;
import net.minecraftforge.client.IItemRenderer.ItemRenderType;
import appeng.block.solids.OreQuartz;
import appeng.client.render.BaseBlockRender;
import appeng.client.render.IRenderHelper;
import appeng.client.render.ModelGenerator;
import appeng.client.texture.ExtraBlockTextures;
import appeng.tile.AEBaseTile;
@@ -39,7 +39,7 @@ public class RenderQuartzOre extends BaseBlockRender<OreQuartz, AEBaseTile>
}
@Override
public void renderInventory( OreQuartz blk, ItemStack is, IRenderHelper renderer, ItemRenderType type, Object[] obj )
public void renderInventory( OreQuartz blk, ItemStack is, ModelGenerator renderer, ItemRenderType type, Object[] obj )
{
super.renderInventory( blk, is, renderer, type, obj );
blk.getRendererInstance().setTemporaryRenderIcon( ExtraBlockTextures.OreQuartzStone.getIcon() );
@@ -48,7 +48,7 @@ public class RenderQuartzOre extends BaseBlockRender<OreQuartz, AEBaseTile>
}
@Override
public boolean renderInWorld( OreQuartz block, IBlockAccess world, BlockPos pos, IRenderHelper renderer )
public boolean renderInWorld( OreQuartz block, IBlockAccess world, BlockPos pos, ModelGenerator renderer )
{
OreQuartz blk = block;
blk.setEnhanceBrightness( true );
src/main/java/appeng/client/render/blocks/RenderQuartzTorch.java
+3 -3
View File
@@ -31,7 +31,7 @@ import appeng.api.util.IOrientable;
import appeng.api.util.IOrientableBlock;
import appeng.block.AEBaseBlock;
import appeng.client.render.BaseBlockRender;
import appeng.client.render.IRenderHelper;
import appeng.client.render.ModelGenerator;
import appeng.tile.AEBaseTile;
@@ -44,7 +44,7 @@ public class RenderQuartzTorch extends BaseBlockRender<AEBaseBlock, AEBaseTile>
}
@Override
public void renderInventory( AEBaseBlock blk, ItemStack is, IRenderHelper renderer, ItemRenderType type, Object[] obj )
public void renderInventory( AEBaseBlock blk, ItemStack is, ModelGenerator renderer, ItemRenderType type, Object[] obj )
{
float Point2 = 6.0f / 16.0f;
float Point3 = 7.0f / 16.0f;
@@ -93,7 +93,7 @@ public class RenderQuartzTorch extends BaseBlockRender<AEBaseBlock, AEBaseTile>
}
@Override
public boolean renderInWorld( AEBaseBlock blk, IBlockAccess world, BlockPos pos, IRenderHelper renderer )
public boolean renderInWorld( AEBaseBlock blk, IBlockAccess world, BlockPos pos, ModelGenerator renderer )
{
IOrientable te = ( (IOrientableBlock) blk ).getOrientable( world, pos );
src/main/java/appeng/client/render/blocks/RenderSpatialPylon.java
+5 -5
View File
@@ -28,7 +28,7 @@ import appeng.api.util.AEPartLocation;
import appeng.block.spatial.BlockSpatialPylon;
import appeng.client.render.BaseBlockRender;
import appeng.client.render.BlockRenderInfo;
import appeng.client.render.IRenderHelper;
import appeng.client.render.ModelGenerator;
import appeng.client.texture.ExtraBlockTextures;
import appeng.client.texture.IAESprite;
import appeng.tile.spatial.TileSpatialPylon;
@@ -43,7 +43,7 @@ public class RenderSpatialPylon extends BaseBlockRender<BlockSpatialPylon, TileS
}
@Override
public void renderInventory( BlockSpatialPylon block, ItemStack is, IRenderHelper renderer, ItemRenderType type, Object[] obj )
public void renderInventory( BlockSpatialPylon block, ItemStack is, ModelGenerator renderer, ItemRenderType type, Object[] obj )
{
renderer.overrideBlockTexture = ExtraBlockTextures.BlockSpatialPylon_dim.getIcon();
super.renderInventory( block, is, renderer, type, obj );
@@ -52,7 +52,7 @@ public class RenderSpatialPylon extends BaseBlockRender<BlockSpatialPylon, TileS
}
@Override
public boolean renderInWorld( BlockSpatialPylon imb, IBlockAccess world, BlockPos pos, IRenderHelper renderer )
public boolean renderInWorld( BlockSpatialPylon imb, IBlockAccess world, BlockPos pos, ModelGenerator renderer )
{
renderer.setRenderBounds( 0, 0, 0, 1, 1, 1 );
@@ -164,7 +164,7 @@ public class RenderSpatialPylon extends BaseBlockRender<BlockSpatialPylon, TileS
return result;
}
private IAESprite getBlockTextureFromSideOutside( BlockSpatialPylon blk, TileSpatialPylon sp, int displayBits, EnumFacing ori, EnumFacing dir, IRenderHelper renderer )
private IAESprite getBlockTextureFromSideOutside( BlockSpatialPylon blk, TileSpatialPylon sp, int displayBits, EnumFacing ori, EnumFacing dir, ModelGenerator renderer )
{
if( ori == dir || ori.getOpposite() == dir )
@@ -188,7 +188,7 @@ public class RenderSpatialPylon extends BaseBlockRender<BlockSpatialPylon, TileS
return renderer.getIcon( blk.getDefaultState() )[0];// blk.getIcon( 0, 0 );
}
private IAESprite getBlockTextureFromSideInside( BlockSpatialPylon blk, TileSpatialPylon sp, int displayBits, EnumFacing ori, EnumFacing dir, IRenderHelper renderer )
private IAESprite getBlockTextureFromSideInside( BlockSpatialPylon blk, TileSpatialPylon sp, int displayBits, EnumFacing ori, EnumFacing dir, ModelGenerator renderer )
{
boolean good = ( displayBits & TileSpatialPylon.DISPLAY_ENABLED ) == TileSpatialPylon.DISPLAY_ENABLED;
src/main/java/appeng/client/render/blocks/RenderTinyTNT.java
+3 -5
View File
@@ -24,12 +24,10 @@ import net.minecraft.init.Blocks;
import net.minecraft.item.ItemStack;
import net.minecraft.util.BlockPos;
import net.minecraft.world.IBlockAccess;
import net.minecraftforge.client.MinecraftForgeClient;
import net.minecraftforge.client.IItemRenderer.ItemRenderType;
import appeng.block.misc.BlockTinyTNT;
import appeng.client.render.BaseBlockRender;
import appeng.client.render.IRenderHelper;
import appeng.client.texture.BaseIcon;
import appeng.client.render.ModelGenerator;
import appeng.client.texture.FullIcon;
import appeng.tile.AEBaseTile;
@@ -43,7 +41,7 @@ public class RenderTinyTNT extends BaseBlockRender<BlockTinyTNT, AEBaseTile>
}
@Override
public void renderInventory( BlockTinyTNT block, ItemStack is, IRenderHelper renderer, ItemRenderType type, Object[] obj )
public void renderInventory( BlockTinyTNT block, ItemStack is, ModelGenerator renderer, ItemRenderType type, Object[] obj )
{
renderer.setOverrideBlockTexture( new FullIcon( Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getTexture( Blocks.tnt.getDefaultState() )) );
renderer.setRenderBounds( 0.25f, 0.0f, 0.25f, 0.75f, 0.5f, 0.75f );
@@ -51,7 +49,7 @@ public class RenderTinyTNT extends BaseBlockRender<BlockTinyTNT, AEBaseTile>
}
@Override
public boolean renderInWorld( BlockTinyTNT imb, IBlockAccess world, BlockPos pos, IRenderHelper renderer )
public boolean renderInWorld( BlockTinyTNT imb, IBlockAccess world, BlockPos pos, ModelGenerator renderer )
{
renderer.setOverrideBlockTexture( new FullIcon( Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getTexture( Blocks.tnt.getDefaultState() )) );
renderer.renderAllFaces = true;
src/main/java/appeng/client/render/blocks/RendererCableBus.java
+4 -4
View File
@@ -38,7 +38,7 @@ import appeng.client.ClientHelper;
import appeng.client.render.BaseBlockRender;
import appeng.client.render.BusRenderHelper;
import appeng.client.render.BusRenderer;
import appeng.client.render.IRenderHelper;
import appeng.client.render.ModelGenerator;
import appeng.facade.IFacadeItem;
import appeng.tile.AEBaseTile;
import appeng.tile.networking.TileCableBus;
@@ -54,7 +54,7 @@ public class RendererCableBus extends BaseBlockRender<BlockCableBus, TileCableBu
}
@Override
public void renderInventory( BlockCableBus blk, ItemStack item, IRenderHelper renderer, ItemRenderType type, Object[] obj )
public void renderInventory( BlockCableBus blk, ItemStack item, ModelGenerator renderer, ItemRenderType type, Object[] obj )
{
renderer.setColorOpaque_F( 1, 1, 1 );
renderer.setBrightness( 14 << 20 | 14 << 4 );
@@ -118,7 +118,7 @@ public class RendererCableBus extends BaseBlockRender<BlockCableBus, TileCableBu
private static final Map<Integer, IPart> RENDER_PART = new HashMap<Integer, IPart>();
@Override
public boolean renderInWorld( BlockCableBus block, IBlockAccess world, BlockPos pos, IRenderHelper renderer )
public boolean renderInWorld( BlockCableBus block, IBlockAccess world, BlockPos pos, ModelGenerator renderer )
{
AEBaseTile t = block.getTileEntity( world, pos );
@@ -136,7 +136,7 @@ public class RendererCableBus extends BaseBlockRender<BlockCableBus, TileCableBu
}
@Override
public void renderTile( BlockCableBus block, TileCableBus t, WorldRenderer tess, double x, double y, double z, float f, IRenderHelper renderer )
public void renderTile( BlockCableBus block, TileCableBus t, WorldRenderer tess, double x, double y, double z, float f, ModelGenerator renderer )
{
if( t instanceof TileCableBus )
{
src/main/java/appeng/client/render/blocks/RendererSecurity.java
+3 -3
View File
@@ -30,7 +30,7 @@ import appeng.api.util.AEColor;
import appeng.api.util.AEPartLocation;
import appeng.block.misc.BlockSecurity;
import appeng.client.render.BaseBlockRender;
import appeng.client.render.IRenderHelper;
import appeng.client.render.ModelGenerator;
import appeng.client.texture.ExtraBlockTextures;
import appeng.client.texture.IAESprite;
import appeng.tile.misc.TileSecurity;
@@ -45,7 +45,7 @@ public class RendererSecurity extends BaseBlockRender<BlockSecurity, TileSecurit
}
@Override
public void renderInventory( BlockSecurity block, ItemStack is, IRenderHelper renderer, ItemRenderType type, Object[] obj )
public void renderInventory( BlockSecurity block, ItemStack is, ModelGenerator renderer, ItemRenderType type, Object[] obj )
{
renderer.overrideBlockTexture = ExtraBlockTextures.getMissing();
this.renderInvBlock( EnumSet.of( AEPartLocation.SOUTH ), block, is, 0x000000, renderer );
@@ -58,7 +58,7 @@ public class RendererSecurity extends BaseBlockRender<BlockSecurity, TileSecurit
}
@Override
public boolean renderInWorld( BlockSecurity imb, IBlockAccess world, BlockPos pos, IRenderHelper renderer )
public boolean renderInWorld( BlockSecurity imb, IBlockAccess world, BlockPos pos, ModelGenerator renderer )
{
TileSecurity sp = imb.getTileEntity( world, pos );
renderer.setRenderBounds( 0, 0, 0, 1, 1, 1 );