tilera/electrodynamics
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Wiki Activity

Fixed textures. I have no clue if anything actually works.

Browse source
This commit is contained in:
Brian Ricketts 2013-03-23 01:00:35 -05:00
parent f222ce9b7f
commit 39bcb6ffa1
4 changed files with 43 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/minecraft/assemblyline/common/block/BlockALMachine.java
View file

@ -1,16 +1,17 @@
package assemblyline.common.block;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import ic2.api.Items;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.util.Icon;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import universalelectricity.prefab.block.BlockAdvanced;
import assemblyline.common.AssemblyLine;
import buildcraft.api.tools.IToolWrench;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
public class BlockALMachine extends BlockAdvanced
{
@ -24,8 +25,23 @@ public class BlockALMachine extends BlockAdvanced
@Override
public void registerIcons(IconRegister iconReg)
{
this.machine_icon = iconReg.registerIcon("machine");
this.machine_icon = iconReg.registerIcon(AssemblyLine.TEXTURE_NAME_PREFIX + "machine");
}
@Override
@SideOnly(Side.CLIENT)
public Icon getBlockTexture(IBlockAccess par1iBlockAccess, int par2, int par3, int par4, int par5)
{
return this.machine_icon;
}
@Override
@SideOnly(Side.CLIENT)
public Icon getBlockTextureFromSideAndMetadata(int par1, int par2)
{
return this.machine_icon;
}
@Override
public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ)
{

2
src/minecraft/assemblyline/common/machine/detector/BlockDetector.java
View file

@ -99,7 +99,7 @@ public class BlockDetector extends BlockImprintable
@Override
public Icon getBlockTextureFromSideAndMetadata(int side, int metadata)
{
if (side == ForgeDirection.DOWN.ordinal())
if (side == ForgeDirection.SOUTH.ordinal())
{
return this.eye_green;
}

11
src/minecraft/assemblyline/common/machine/encoder/ItemDisk.java
View file

@ -3,6 +3,10 @@ package assemblyline.common.machine.encoder;
import java.util.ArrayList;
import java.util.List;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
@ -20,6 +24,13 @@ public class ItemDisk extends Item
this.setCreativeTab(TabAssemblyLine.INSTANCE);
this.setHasSubtypes(true);
}
@Override
@SideOnly(Side.CLIENT)
public void updateIcons(IconRegister par1IconRegister)
{
this.iconIndex = par1IconRegister.registerIcon(AssemblyLine.TEXTURE_NAME_PREFIX + "disk");
}
@Override
public int getItemStackLimit()

12
src/minecraft/assemblyline/common/machine/imprinter/ItemImprinter.java
View file

@ -3,6 +3,10 @@ package assemblyline.common.machine.imprinter;
import java.util.ArrayList;
import java.util.List;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityList;
import net.minecraft.entity.IProjectile;
@ -22,7 +26,13 @@ public class ItemImprinter extends Item
this.setUnlocalizedName("imprint");
this.setCreativeTab(TabAssemblyLine.INSTANCE);
this.setHasSubtypes(true);
}
@Override
@SideOnly(Side.CLIENT)
public void updateIcons(IconRegister par1IconRegister)
{
this.iconIndex = par1IconRegister.registerIcon(AssemblyLine.TEXTURE_NAME_PREFIX + "imprint");
}
@Override