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

Fixed tank rendering in inventory

Browse source 
partially fixed the BlockMarker
fixed the template item icons
fixed the oil bucket icon
Added texture for pipeWaterproofing and moved it to the BC tab
This commit is contained in:
Krapht 2013-03-22 23:00:02 +01:00
parent dd0122d622
commit d888cb7b8d
7 changed files with 27 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
buildcraft_resources/mods/buildcraft/textures/items/pipeWaterproof.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 552 B

3
common/buildcraft/BuildCraftTransport.java
View file

@ -26,6 +26,7 @@ import buildcraft.api.recipes.AssemblyRecipe;
import buildcraft.api.transport.IExtractionHandler;
import buildcraft.api.transport.IPipe;
import buildcraft.api.transport.PipeManager;
import buildcraft.core.CreativeTabBuildCraft;
import buildcraft.core.DefaultProps;
import buildcraft.core.ItemBuildCraft;
import buildcraft.core.Version;
@ -269,7 +270,7 @@ public class BuildCraftTransport {
pipeWaterproof = new ItemBuildCraft(pipeWaterproofId.getInt());
pipeWaterproof.setUnlocalizedName("pipeWaterproof");
pipeWaterproof.setCreativeTab(CreativeTabs.tabMaterials);
pipeWaterproof.setCreativeTab(CreativeTabBuildCraft.tabBuildCraft);
LanguageRegistry.addName(pipeWaterproof, "Pipe Waterproof");
genericPipeBlock = new BlockGenericPipe(genericPipeId.getInt());
GameRegistry.registerBlock(genericPipeBlock);

10
common/buildcraft/builders/BlockMarker.java
View file

@ -22,8 +22,10 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.AxisAlignedBB;
import net.minecraft.util.Icon;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.util.Vec3;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import buildcraft.BuildCraftBuilders;
import buildcraft.BuildCraftCore;
@ -224,6 +226,12 @@ public class BlockMarker extends BlockContainer {
@SideOnly(Side.CLIENT)
public void registerIcons(IconRegister par1IconRegister)
{
par1IconRegister.registerIcon("buildcraft:blockMarker");
this.blockIcon = par1IconRegister.registerIcon("buildcraft:blockMarker");
}
@Override
@SideOnly(Side.CLIENT)
public Icon getBlockTexture(IBlockAccess par1iBlockAccess, int par2, int par3, int par4, int par5) {
return this.blockIcon;
}
}

7
common/buildcraft/builders/ItemBptBase.java
View file

@ -60,11 +60,4 @@ public abstract class ItemBptBase extends ItemBuildCraft {
@Override
public void onUpdate(ItemStack itemstack, World world, Entity entity, int i, boolean flag) {
}
@Override
@SideOnly(Side.CLIENT)
public void updateIcons(IconRegister par1IconRegister)
{
par1IconRegister.registerIcon("buildcraft:template_clean");
}
}

6
common/buildcraft/builders/ItemBptTemplate.java
View file

@ -6,7 +6,7 @@ import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
public class ItemBptTemplate extends ItemBptBase {
private Icon usedTemplate;
private Icon usedTemplate;
public ItemBptTemplate(int i) {
super(i);
}
@ -23,7 +23,7 @@ public class ItemBptTemplate extends ItemBptBase {
@SideOnly(Side.CLIENT)
public void updateIcons(IconRegister par1IconRegister)
{
super.updateIcons(par1IconRegister);
par1IconRegister.registerIcon("buildcraft:template_used");
iconIndex = par1IconRegister.registerIcon("buildcraft:template_clean");
usedTemplate = par1IconRegister.registerIcon("buildcraft:template_used");
}
}

2
common/buildcraft/energy/ItemBucketOil.java
View file

@ -35,6 +35,6 @@ public class ItemBucketOil extends ItemBucket {
@SideOnly(Side.CLIENT)
public void updateIcons(IconRegister par1IconRegister)
{
par1IconRegister.registerIcon("buildcraft:oil_bucket");
this.iconIndex = par1IconRegister.registerIcon("buildcraft:oil_bucket");
}
}

12
common/buildcraft/factory/BlockTank.java
View file

@ -63,6 +63,18 @@ public class BlockTank extends BlockContainer {
return new TileTank();
}
@Override
@SideOnly(Side.CLIENT)
public Icon getBlockTextureFromSideAndMetadata(int par1, int par2) {
switch(par1){
case 0:
case 1:
return textureTop;
default:
return textureBottomSide;
}
}
@SuppressWarnings({ "all" })
public Icon getBlockTexture(IBlockAccess iblockaccess, int i, int j, int k, int l) {
switch (l) {