restore proper engine breaking icons, re-optimize textures

common/buildcraft/BuildCraftCore.java

@@ -361,7 +361,7 @@ public class BuildCraftCore extends BuildCraftMod {
 
 		engineBlock = (BlockEngine) CompatHooks.INSTANCE.getBlock(BlockEngine.class);
 		CoreProxy.proxy.registerBlock(engineBlock, ItemEngine.class);
-		engineBlock.registerTile((Class<? extends TileEngineBase>) CompatHooks.INSTANCE.getTile(TileEngineWood.class), "tile.engineWood");
+		engineBlock.registerTile((Class<? extends TileEngineBase>) CompatHooks.INSTANCE.getTile(TileEngineWood.class), "tile.engineWood", "buildcraftcore:engineWood");
 		CoreProxy.proxy.registerTileEntity(TileEngineWood.class, "net.minecraft.src.buildcraft.energy.TileEngineWood");
 
 		markerBlock = (BlockMarker) CompatHooks.INSTANCE.getBlock(BlockMarker.class);

common/buildcraft/BuildCraftEnergy.java

@@ -100,7 +100,6 @@ public class BuildCraftEnergy extends BuildCraftMod {
 	public static Item bucketRedPlasma;
 	public static Item fuel;
 
-	public static Achievement engineAchievement1;
 	public static Achievement engineAchievement2;
 	public static Achievement engineAchievement3;
 
@@ -288,9 +287,9 @@ public class BuildCraftEnergy extends BuildCraftMod {
 		BuildcraftFuelRegistry.coolant.addSolidCoolant(StackKey.stack(Blocks.ice), StackKey.fluid(FluidRegistry.WATER), 1.5f);
 		BuildcraftFuelRegistry.coolant.addSolidCoolant(StackKey.stack(Blocks.packed_ice), StackKey.fluid(FluidRegistry.WATER), 2.0f);
 
-		BuildCraftCore.engineBlock.registerTile(TileEngineStone.class, "tile.engineStone");
-		BuildCraftCore.engineBlock.registerTile(TileEngineIron.class, "tile.engineIron");
-		BuildCraftCore.engineBlock.registerTile(TileEngineCreative.class, "tile.engineCreative");
+		BuildCraftCore.engineBlock.registerTile(TileEngineStone.class, "tile.engineStone", "buildcraftenergy:engineStone");
+		BuildCraftCore.engineBlock.registerTile(TileEngineIron.class, "tile.engineIron", "buildcraftenergy:engineIron");
+		BuildCraftCore.engineBlock.registerTile(TileEngineCreative.class, "tile.engineCreative", "buildcraftenergy:engineCreative");
 
 		InterModComms.registerHandler(new IMCHandlerEnergy());
 

common/buildcraft/core/BlockEngine.java

@@ -15,6 +15,7 @@ import buildcraft.core.lib.engines.TileEngineBase;
 public class BlockEngine extends BlockEngineBase {
 	private final ArrayList<Class<? extends TileEngineBase>> engineTiles;
 	private final ArrayList<String> names;
+	private final ArrayList<String> texturePaths;
 
 	public BlockEngine() {
 		super();
@@ -22,6 +23,20 @@ public class BlockEngine extends BlockEngineBase {
 
 		engineTiles = new ArrayList<Class<? extends TileEngineBase>>(16);
 		names = new ArrayList<String>(16);
+		texturePaths = new ArrayList<String>(16);
+	}
+
+	@Override
+	public String getTexturePrefix(int meta, boolean addPrefix) {
+		if (meta < texturePaths.size()) {
+			if (addPrefix) {
+				return texturePaths.get(meta).replaceAll(":", ":textures/blocks/");
+			} else {
+				return texturePaths.get(meta);
+			}
+		} else {
+			return null;
+		}
 	}
 
 	@Override
@@ -29,9 +44,10 @@ public class BlockEngine extends BlockEngineBase {
 		return names.get(metadata % names.size());
 	}
 
-	public void registerTile(Class<? extends TileEngineBase> engineTile, String name) {
+	public void registerTile(Class<? extends TileEngineBase> engineTile, String name, String texturePath) {
 		engineTiles.add(engineTile);
 		names.add(name);
+		texturePaths.add(texturePath);
 	}
 
 	@Override

common/buildcraft/core/TileEngineWood.java

@@ -22,11 +22,6 @@ public class TileEngineWood extends TileEngineBase implements IRedstoneEngine {
 
 	private boolean hasSent = false;
 
-	@Override
-	public String getResourcePrefix() {
-		return "buildcraftcore:textures/blocks/engineWood";
-	}
-
 	@Override
 	public ResourceLocation getTrunkTexture(EnergyStage stage) {
 		return super.getTrunkTexture(stage == EnergyStage.RED && progress < 0.5 ? EnergyStage.YELLOW : stage);

common/buildcraft/core/lib/engines/BlockEngineBase.java

@@ -13,16 +13,20 @@ import java.util.Random;
 
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
+import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.IIcon;
 import net.minecraft.util.MovingObjectPosition;
 import net.minecraft.util.Vec3;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 
 import cpw.mods.fml.common.FMLCommonHandler;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraftforge.common.util.ForgeDirection;
 
 import buildcraft.BuildCraftCore;
@@ -45,6 +49,27 @@ public abstract class BlockEngineBase extends BlockBuildCraft implements ICustom
 		super(Material.iron);
 	}
 
+	public abstract String getTexturePrefix(int meta, boolean addPrefix);
+
+	@Override
+	@SideOnly(Side.CLIENT)
+	public IIcon getIconAbsolute(int side, int metadata) {
+		return icons[metadata] == null ? icons[0][0] : icons[metadata][0];
+	}
+
+	@Override
+	@SideOnly(Side.CLIENT)
+	public void registerBlockIcons(IIconRegister register) {
+		icons = new IIcon[16][];
+		for (int meta = 0; meta < 16; meta++) {
+			String prefix = getTexturePrefix(meta, false);
+			if (prefix != null) {
+				icons[meta] = new IIcon[1];
+				icons[meta][0] = register.registerIcon(prefix + "/icon");
+			}
+		}
+	}
+
 	@Override
 	public boolean isOpaqueCube() {
 		return false;

common/buildcraft/core/lib/engines/TileEngineBase.java

@@ -73,19 +73,17 @@ public abstract class TileEngineBase extends TileBuildCraft implements IPipeConn
 		}
 	}
 
-	public abstract String getResourcePrefix();
-
 	public ResourceLocation getBaseTexture() {
-		return new ResourceLocation(getResourcePrefix() + "/base.png");
+		return new ResourceLocation(((BlockEngineBase) getBlockType()).getTexturePrefix(getBlockMetadata(), true) + "/base.png");
 	}
 
 	public ResourceLocation getChamberTexture() {
-		return new ResourceLocation(getResourcePrefix() + "/chamber.png");
+		return new ResourceLocation(((BlockEngineBase) getBlockType()).getTexturePrefix(getBlockMetadata(), true) + "/chamber.png");
 	}
 
 	public ResourceLocation getTrunkTexture(EnergyStage stage) {
-		if (ResourceUtils.resourceExists(getResourcePrefix() + "/trunk.png")) {
-			return new ResourceLocation(getResourcePrefix() + "/trunk.png");
+		if (ResourceUtils.resourceExists(((BlockEngineBase) getBlockType()).getTexturePrefix(getBlockMetadata(), true) + "/trunk.png")) {
+			return new ResourceLocation(((BlockEngineBase) getBlockType()).getTexturePrefix(getBlockMetadata(), true) + "/trunk.png");
 		}
 
 		switch (stage) {

common/buildcraft/core/proxy/CoreProxyClient.java

@@ -99,7 +99,10 @@ public class CoreProxyClient extends CoreProxy {
 
 		ClientRegistry.bindTileEntitySpecialRenderer(TileEngineBase.class, new RenderEngine());
 		for (int i = 0; i < BuildCraftCore.engineBlock.getEngineCount(); i++) {
-			RenderingEntityBlocks.blockByEntityRenders.put(new RenderingEntityBlocks.EntityRenderIndex(BuildCraftCore.engineBlock, i), new RenderEngine((TileEngineBase) BuildCraftCore.engineBlock.createTileEntity(null, i)));
+			TileEngineBase engineTile = (TileEngineBase) BuildCraftCore.engineBlock.createTileEntity(null, i);
+			engineTile.blockType = BuildCraftCore.engineBlock;
+			engineTile.blockMetadata = i;
+			RenderingEntityBlocks.blockByEntityRenders.put(new RenderingEntityBlocks.EntityRenderIndex(BuildCraftCore.engineBlock, i), new RenderEngine(engineTile));
 		}
 	}
 

common/buildcraft/energy/TileEngineCreative.java

@@ -32,11 +32,6 @@ public class TileEngineCreative extends TileEngineBase {
 		return EnergyStage.BLUE;
 	}
 
-	@Override
-	public String getResourcePrefix() {
-		return "buildcraftenergy:textures/blocks/engineCreative";
-	}
-
 	@Override
 	public boolean onBlockActivated(EntityPlayer player, ForgeDirection side) {
 		if (!getWorldObj().isRemote) {

common/buildcraft/energy/TileEngineIron.java

@@ -64,11 +64,6 @@ public class TileEngineIron extends TileEngineWithInventory implements IFluidHan
 		tankManager.add(tankCoolant);
 	}
 
-	@Override
-	public String getResourcePrefix() {
-		return "buildcraftenergy:textures/blocks/engineIron";
-	}
-
 	@Override
 	public boolean onBlockActivated(EntityPlayer player, ForgeDirection side) {
 		if (super.onBlockActivated(player, side)) {

common/buildcraft/energy/TileEngineStone.java

@@ -41,11 +41,6 @@ public class TileEngineStone extends TileEngineWithInventory {
 		super(1);
 	}
 
-	@Override
-	public String getResourcePrefix() {
-		return "buildcraftenergy:textures/blocks/engineStone";
-	}
-
 	@Override
 	public boolean onBlockActivated(EntityPlayer player, ForgeDirection side) {
 		if (super.onBlockActivated(player, side)) {