Anvilcraft/buildcraft
3
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

BlockGenericPipe now returns proper pipe icon, might help WAILA icon rendering

Browse source
This commit is contained in:
asiekierka 2015-04-03 13:45:44 +02:00
parent 93df0d82be
commit fb1c7a5561
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
common/buildcraft/transport/BlockGenericPipe.java
View file

@ -111,6 +111,7 @@ public class BlockGenericPipe extends BlockBuildCraft {
} }
private boolean skippedFirstIconRegister; private boolean skippedFirstIconRegister;
private ItemPipe itemPipe;
/* Defined subprograms ************************************************* */ /* Defined subprograms ************************************************* */
public BlockGenericPipe() { public BlockGenericPipe() {
@ -1130,6 +1131,9 @@ public class BlockGenericPipe extends BlockBuildCraft {
@Override @Override
public IIcon getIcon(int side, int meta) { public IIcon getIcon(int side, int meta) {
return PipeIconProvider.TYPE.PipeItemsStone.getIcon(); if (itemPipe == null) {
itemPipe = (ItemPipe) Item.getItemFromBlock(this);
}
return itemPipe.getIconFromDamage(0);
} }
} }

2
common/buildcraft/transport/render/PipeRendererWorld.java
View file

@ -11,9 +11,7 @@ package buildcraft.transport.render;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.Tessellator;
import net.minecraft.init.Blocks;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.IIcon;
import net.minecraft.world.IBlockAccess; import net.minecraft.world.IBlockAccess;
import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;