More texture changes

This commit is contained in:
Gig 2015-05-03 22:15:39 +01:00
parent 8910f9f9db
commit dec2c68e86
8 changed files with 94 additions and 28 deletions

View file

@ -72,10 +72,9 @@ public class BlockBlastFurnace extends BlockMachineBase {
public void registerBlockIcons(IIconRegister icon) public void registerBlockIcons(IIconRegister icon)
{ {
this.blockIcon = icon.registerIcon("techreborn:machine/machine_side"); this.blockIcon = icon.registerIcon("techreborn:machine/machine_side");
this.iconFront = icon this.iconFront = icon.registerIcon("techreborn:machine/industrial_blast_furnace_front_off");
.registerIcon("techreborn:machine/industrial_blast_furnace_front_off"); this.iconTop = icon.registerIcon("techreborn:machine/advanced_machine_side");
this.iconTop = icon.registerIcon("techreborn:machine/machine_side"); this.iconBottom = icon.registerIcon("techreborn:machine/advanced_machine_side");
this.iconBottom = icon.registerIcon("techreborn:machine/machine_side");
} }
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)

View file

@ -54,7 +54,7 @@ public class BlockCentrifuge extends BlockMachineBase {
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public void registerBlockIcons(IIconRegister icon) public void registerBlockIcons(IIconRegister icon)
{ {
this.blockIcon = icon.registerIcon("techreborn:machine/machine_side"); this.blockIcon = icon.registerIcon("techreborn:machine/industrial_centrifuge_side_off");
this.iconFront = icon.registerIcon("techreborn:machine/industrial_centrifuge_side_off"); this.iconFront = icon.registerIcon("techreborn:machine/industrial_centrifuge_side_off");
this.iconTop = icon.registerIcon("techreborn:machine/industrial_centrifuge_top_off"); this.iconTop = icon.registerIcon("techreborn:machine/industrial_centrifuge_top_off");
this.iconBottom = icon.registerIcon("techreborn:machine/industrial_centrifuge_bottom"); this.iconBottom = icon.registerIcon("techreborn:machine/industrial_centrifuge_bottom");

View file

@ -57,7 +57,7 @@ public class BlockImplosionCompressor extends BlockMachineBase{
{ {
this.blockIcon = icon.registerIcon("techreborn:machine/machine_side"); this.blockIcon = icon.registerIcon("techreborn:machine/machine_side");
this.iconFront = icon.registerIcon("techreborn:machine/implosion_compressor_front_off"); this.iconFront = icon.registerIcon("techreborn:machine/implosion_compressor_front_off");
this.iconTop = icon.registerIcon("techreborn:machine/machine_side"); this.iconTop = icon.registerIcon("techreborn:machine/advanced_machine_side");
this.iconBottom = icon.registerIcon("techreborn:machine/machine_side"); this.iconBottom = icon.registerIcon("techreborn:machine/machine_side");
} }

View file

@ -0,0 +1,61 @@
package techreborn.blocks;
import net.minecraft.block.Block;
import net.minecraft.block.BlockContainer;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.IIcon;
import net.minecraft.util.MathHelper;
import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;
import techreborn.Core;
import techreborn.client.GuiHandler;
import techreborn.client.TechRebornCreativeTab;
import techreborn.tiles.TileAlloySmelter;
import techreborn.tiles.TileBlastFurnace;
import techreborn.tiles.TileMachineCasing;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
public class BlockMagicEnergyConverter extends BlockMachineBase {
@SideOnly(Side.CLIENT)
private IIcon iconFront;
@SideOnly(Side.CLIENT)
private IIcon iconTop;
@SideOnly(Side.CLIENT)
private IIcon iconBottom;
public BlockMagicEnergyConverter(Material material)
{
super(material);
setBlockName("techreborn.magicrnergyconverter");
}
@Override
@SideOnly(Side.CLIENT)
public void registerBlockIcons(IIconRegister icon)
{
this.blockIcon = icon.registerIcon("techreborn:machine/magic_energy_absorber_side");
this.iconFront = icon.registerIcon("techreborn:machine/magic_energy_converter_front on");
this.iconTop = icon.registerIcon("techreborn:machine/magic_energy_absorber_top");
this.iconBottom = icon.registerIcon("techreborn:machine/magic_energy_absorber_bottom");
}
@SideOnly(Side.CLIENT)
public IIcon getIcon(int side, int metadata)
{
return metadata == 0 && side == 3 ? this.iconFront
: side == 1 ? this.iconTop : (side == 0 ? this.iconTop
: (side == metadata ? this.iconFront : this.blockIcon));
}
}

View file

@ -16,9 +16,13 @@ import cpw.mods.fml.relauncher.SideOnly;
public class BlockQuantumChest extends BlockMachineBase { public class BlockQuantumChest extends BlockMachineBase {
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
private IIcon top; private IIcon iconFront;
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
private IIcon other; private IIcon iconTop;
@SideOnly(Side.CLIENT)
private IIcon iconBottom;
public BlockQuantumChest() public BlockQuantumChest()
{ {
@ -46,21 +50,19 @@ public class BlockQuantumChest extends BlockMachineBase {
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public void registerBlockIcons(IIconRegister icon) public void registerBlockIcons(IIconRegister icon)
{ {
top = icon.registerIcon("techreborn:machine/quantum_top"); this.blockIcon = icon.registerIcon("techreborn:machine/qchest_side");
other = icon.registerIcon("techreborn:machine/quantum_chest"); this.iconFront = icon.registerIcon("techreborn:machine/quantum_chest");
this.iconTop = icon.registerIcon("techreborn:machine/quantum_top");
this.iconBottom = icon.registerIcon("techreborn:machine/machine_bottom");
} }
@Override
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public IIcon getIcon(int currentSide, int meta) public IIcon getIcon(int side, int metadata)
{ {
// TODO chest rotation
if (currentSide == 1) return metadata == 0 && side == 3 ? this.iconFront
{ : side == 1 ? this.iconTop : (side == 0 ? this.iconTop
return top; : (side == metadata ? this.iconFront : this.blockIcon));
} else
{
return other;
}
} }
} }

View file

@ -55,11 +55,10 @@ public class BlockRollingMachine extends BlockMachineBase {
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public void registerBlockIcons(IIconRegister icon) public void registerBlockIcons(IIconRegister icon)
{ {
this.blockIcon = icon.registerIcon("techreborn:machine/machine_side"); this.blockIcon = icon.registerIcon("techreborn:machine/rolling_machine_side_off");
this.iconFront = icon.registerIcon("techreborn:machine/machine_side"); this.iconFront = icon.registerIcon("techreborn:machine/rolling_machine_side_off");
this.iconTop = icon this.iconTop = icon.registerIcon("techreborn:machine/rollingmachine_top");
.registerIcon("techreborn:machine/rollingmachine_top"); this.iconBottom = icon.registerIcon("techreborn:machine/machine_bottom");
this.iconBottom = icon.registerIcon("techreborn:machine/machine_side");
} }
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)

View file

@ -59,10 +59,10 @@ public class BlockThermalGenerator extends BlockMachineBase {
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public void registerBlockIcons(IIconRegister icon) public void registerBlockIcons(IIconRegister icon)
{ {
this.blockIcon = icon.registerIcon("techreborn:machine/machine_side"); this.blockIcon = icon.registerIcon("techreborn:machine/thermal_generator_side_off");
this.iconFront = icon.registerIcon("techreborn:machine/machine_side"); this.iconFront = icon.registerIcon("techreborn:machine/thermal_generator_side_off");
this.iconTop = icon.registerIcon("techreborn:machine/thermal_generator_top_off"); this.iconTop = icon.registerIcon("techreborn:machine/thermal_generator_top_off");
this.iconBottom = icon.registerIcon("techreborn:machine/thermal_generator_side_off"); this.iconBottom = icon.registerIcon("techreborn:machine/machine_bottom");
} }
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)

View file

@ -13,6 +13,7 @@ import techreborn.blocks.BlockGrinder;
import techreborn.blocks.BlockHighlyAdvancedMachine; import techreborn.blocks.BlockHighlyAdvancedMachine;
import techreborn.blocks.BlockImplosionCompressor; import techreborn.blocks.BlockImplosionCompressor;
import techreborn.blocks.BlockMachineCasing; import techreborn.blocks.BlockMachineCasing;
import techreborn.blocks.BlockMagicEnergyConverter;
import techreborn.blocks.BlockMatterFabricator; import techreborn.blocks.BlockMatterFabricator;
import techreborn.blocks.BlockOre; import techreborn.blocks.BlockOre;
import techreborn.blocks.BlockQuantumChest; import techreborn.blocks.BlockQuantumChest;
@ -57,6 +58,7 @@ public class ModBlocks {
public static Block ChunkLoader; public static Block ChunkLoader;
public static Block HighAdvancedMachineBlock; public static Block HighAdvancedMachineBlock;
public static Block Dragoneggenergysiphoner; public static Block Dragoneggenergysiphoner;
public static Block Magicenergeyconverter;
public static Block ore; public static Block ore;
public static Block storage; public static Block storage;
@ -138,6 +140,9 @@ public class ModBlocks {
Dragoneggenergysiphoner = new BlockDragonEggSiphoner(Material.rock); Dragoneggenergysiphoner = new BlockDragonEggSiphoner(Material.rock);
GameRegistry.registerBlock(Dragoneggenergysiphoner, "dragoneggenergsiphon"); GameRegistry.registerBlock(Dragoneggenergysiphoner, "dragoneggenergsiphon");
Magicenergeyconverter = new BlockMagicEnergyConverter(Material.rock);
GameRegistry.registerBlock(Magicenergeyconverter, "magicenergyconverter");
registerOreDict(); registerOreDict();
} }