Moved resources to seperate directory.

Fixed a NPE in assembly table on SSP.

buildcraft_client/net/minecraft/src/buildcraft/builders/GuiBlueprintLibrary.java

@@ -15,6 +15,7 @@ import net.minecraft.src.GuiButton;
 import net.minecraft.src.ModLoader;
 import net.minecraft.src.buildcraft.core.BptBase;
 import net.minecraft.src.buildcraft.core.BptPlayerIndex;
+import net.minecraft.src.buildcraft.core.DefaultProps;
 import net.minecraft.src.buildcraft.core.GuiBuildCraft;
 import net.minecraft.src.buildcraft.core.utils.StringUtil;
 
@@ -105,7 +106,7 @@ public class GuiBlueprintLibrary extends GuiBuildCraft {
 	protected void drawGuiContainerBackgroundLayer(float f, int x, int y) {
 		int i = 0;
 		// if (library.owner.equals(player.username)) {
-		i = mc.renderEngine.getTexture("/net/minecraft/src/buildcraft/builders/gui/library_rw.png");
+		i = mc.renderEngine.getTexture(DefaultProps.TEXTURE_PATH_GUI + "/library_rw.png");
 		// } else {
 		// i = mc.renderEngine
 		// .getTexture("/net/minecraft/src/buildcraft/builders/gui/library_r.png");

buildcraft_client/net/minecraft/src/buildcraft/builders/GuiBuilder.java

@@ -13,6 +13,7 @@ import java.util.Collection;
 
 import net.minecraft.src.IInventory;
 import net.minecraft.src.ItemStack;
+import net.minecraft.src.buildcraft.core.DefaultProps;
 import net.minecraft.src.buildcraft.core.GuiAdvancedInterface;
 import net.minecraft.src.buildcraft.core.utils.StringUtil;
 
@@ -60,10 +61,10 @@ public class GuiBuilder extends GuiAdvancedInterface {
 		int realXSize = 0;
 
 		if (builder.isBuildingBlueprint()) {
-			i = mc.renderEngine.getTexture("/net/minecraft/src/buildcraft/builders/gui/builder_blueprint.png");
+			i = mc.renderEngine.getTexture(DefaultProps.TEXTURE_PATH_GUI + "/builder_blueprint.png");
 			realXSize = 256;
 		} else {
-			i = mc.renderEngine.getTexture("/net/minecraft/src/buildcraft/builders/gui/builder.png");
+			i = mc.renderEngine.getTexture(DefaultProps.TEXTURE_PATH_GUI + "/builder.png");
 			realXSize = 176;
 		}
 

buildcraft_client/net/minecraft/src/buildcraft/builders/GuiFiller.java

@@ -10,6 +10,7 @@
 package net.minecraft.src.buildcraft.builders;
 
 import net.minecraft.src.IInventory;
+import net.minecraft.src.buildcraft.core.DefaultProps;
 import net.minecraft.src.buildcraft.core.GuiBuildCraft;
 import net.minecraft.src.buildcraft.core.utils.StringUtil;
 
@@ -42,7 +43,7 @@ public class GuiFiller extends GuiBuildCraft {
 	@Override
 	protected void drawGuiContainerBackgroundLayer(float f, int x, int y) {
 
-		int i = mc.renderEngine.getTexture("/net/minecraft/src/buildcraft/builders/gui/filler.png");
+		int i = mc.renderEngine.getTexture(DefaultProps.TEXTURE_PATH_GUI + "/filler.png");
 		GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
 		mc.renderEngine.bindTexture(i);
 

buildcraft_client/net/minecraft/src/buildcraft/builders/GuiTemplate.java

@@ -13,6 +13,7 @@ import java.util.Date;
 
 import net.minecraft.src.BuildCraftBuilders;
 import net.minecraft.src.IInventory;
+import net.minecraft.src.buildcraft.core.DefaultProps;
 import net.minecraft.src.buildcraft.core.GuiBuildCraft;
 import net.minecraft.src.buildcraft.core.utils.StringUtil;
 
@@ -46,7 +47,7 @@ public class GuiTemplate extends GuiBuildCraft {
 
 	@Override
 	protected void drawGuiContainerBackgroundLayer(float f, int x, int y) {
-		int i = mc.renderEngine.getTexture("/net/minecraft/src/buildcraft/builders/gui/template_gui.png");
+		int i = mc.renderEngine.getTexture(DefaultProps.TEXTURE_PATH_GUI + "/template_gui.png");
 		GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
 		mc.renderEngine.bindTexture(i);
 		int j = (width - xSize) / 2;

buildcraft_client/net/minecraft/src/buildcraft/core/CoreProxy.java

@@ -99,10 +99,10 @@ public class CoreProxy {
 			char[] map = new char[256];
 			// every slot is free!
 			Arrays.fill(map, '1');
-			SpriteHelper.registerSpriteMapForFile(BuildCraftCore.externalBuildCraftTexture, new String(map));
+			SpriteHelper.registerSpriteMapForFile(DefaultProps.TEXTURE_EXTERNAL, new String(map));
 			registeredOverrideTextureMap = true;
 		}
-		return ModLoader.addOverride(BuildCraftCore.externalBuildCraftTexture, pathToTexture) + 256;
+		return ModLoader.addOverride(DefaultProps.TEXTURE_EXTERNAL, pathToTexture) + 256;
 	}
 
 	public static long getHash(IBlockAccess iBlockAccess) {

buildcraft_client/net/minecraft/src/buildcraft/core/GuiBuildCraft.java

@@ -189,7 +189,7 @@ public abstract class GuiBuildCraft extends GuiContainer {
 		}
 
 		protected void drawBackground(int x, int y) {
-			int texture = mc.renderEngine.getTexture("/gfx/gui/ledger.png");
+			int texture = mc.renderEngine.getTexture(DefaultProps.TEXTURE_PATH_GUI + "/ledger.png");
 
 			float colorR = (overlayColor >> 16 & 255) / 255.0F;
 			float colorG = (overlayColor >> 8 & 255) / 255.0F;

buildcraft_client/net/minecraft/src/buildcraft/core/RenderEntityBlock.java

@@ -86,7 +86,7 @@ public class RenderEntityBlock extends Render {
 					GL11.glRotatef(entity.rotationZ, 0, 0, 1);
 					GL11.glTranslatef(iBase, jBase, kBase);
 
-					MinecraftForgeClient.bindTexture(BuildCraftCore.customBuildCraftTexture);
+					MinecraftForgeClient.bindTexture(DefaultProps.TEXTURE_BLOCKS);
 
 					int lightX, lightY, lightZ;
 

buildcraft_client/net/minecraft/src/buildcraft/core/RenderRobot.java

@@ -32,7 +32,7 @@ public class RenderRobot extends Render {
 		GL11.glDisable(2896 /* GL_LIGHTING */);
 		GL11.glTranslated(x, y, z);
 
-		MinecraftForgeClient.bindTexture("/net/minecraft/src/buildcraft/core/gui/robot.png");
+		MinecraftForgeClient.bindTexture(DefaultProps.TEXTURE_PATH_ENTITIES + "/robot.png");
 
 		float factor = (float) (1.0 / 16.0);
 

buildcraft_client/net/minecraft/src/buildcraft/energy/GuiCombustionEngine.java

@@ -12,6 +12,7 @@ package net.minecraft.src.buildcraft.energy;
 import net.minecraft.src.Block;
 import net.minecraft.src.InventoryPlayer;
 import net.minecraft.src.Item;
+import net.minecraft.src.buildcraft.core.DefaultProps;
 import net.minecraft.src.buildcraft.core.utils.StringUtil;
 import net.minecraft.src.forge.ITextureProvider;
 import net.minecraft.src.forge.MinecraftForgeClient;
@@ -34,7 +35,7 @@ public class GuiCombustionEngine extends GuiEngine {
 
 	@Override
 	protected void drawGuiContainerBackgroundLayer(float f, int x, int y) {
-		int i = mc.renderEngine.getTexture("/net/minecraft/src/buildcraft/energy/gui/combustion_engine_gui.png");
+		int i = mc.renderEngine.getTexture(DefaultProps.TEXTURE_PATH_GUI + "/combustion_engine_gui.png");
 		GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
 		mc.renderEngine.bindTexture(i);
 		int j = (width - xSize) / 2;
@@ -94,7 +95,7 @@ public class GuiCombustionEngine extends GuiEngine {
 				break;
 		}
 
-		int i = mc.renderEngine.getTexture("/net/minecraft/src/buildcraft/energy/gui/combustion_engine_gui.png");
+		int i = mc.renderEngine.getTexture(DefaultProps.TEXTURE_PATH_GUI + "/combustion_engine_gui.png");
 
 		mc.renderEngine.bindTexture(i);
 		drawTexturedModalRect(j + col, k + line, 176, 0, 16, 60);

buildcraft_client/net/minecraft/src/buildcraft/energy/GuiSteamEngine.java

@@ -10,6 +10,7 @@
 package net.minecraft.src.buildcraft.energy;
 
 import net.minecraft.src.InventoryPlayer;
+import net.minecraft.src.buildcraft.core.DefaultProps;
 import net.minecraft.src.buildcraft.core.utils.StringUtil;
 
 import org.lwjgl.opengl.GL11;
@@ -30,7 +31,7 @@ public class GuiSteamEngine extends GuiEngine {
 
 	@Override
 	protected void drawGuiContainerBackgroundLayer(float f, int x, int y) {
-		int i = mc.renderEngine.getTexture("/net/minecraft/src/buildcraft/energy/gui/steam_engine_gui.png");
+		int i = mc.renderEngine.getTexture(DefaultProps.TEXTURE_PATH_GUI + "/steam_engine_gui.png");
 		GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
 		mc.renderEngine.bindTexture(i);
 		int j = (width - xSize) / 2;

buildcraft_client/net/minecraft/src/buildcraft/energy/RenderEngine.java

@@ -16,6 +16,7 @@ import net.minecraft.src.ModelRenderer;
 import net.minecraft.src.TileEntity;
 import net.minecraft.src.TileEntitySpecialRenderer;
 import net.minecraft.src.buildcraft.api.Orientations;
+import net.minecraft.src.buildcraft.core.DefaultProps;
 import net.minecraft.src.buildcraft.core.IInventoryRenderer;
 import net.minecraft.src.buildcraft.energy.Engine.EnergyStage;
 import net.minecraft.src.forge.MinecraftForgeClient;
@@ -153,7 +154,7 @@ public class RenderEngine extends TileEntitySpecialRenderer implements IInventor
 		movingBox.render(factor);
 		GL11.glTranslatef(-translate[0] * translatefact, -translate[1] * translatefact, -translate[2] * translatefact);
 
-		MinecraftForgeClient.bindTexture("/net/minecraft/src/buildcraft/energy/gui/chamber.png");
+		MinecraftForgeClient.bindTexture(DefaultProps.TEXTURE_PATH_BLOCKS + "/chamber.png");
 
 		float chamberf = 2F / 16F;
 
@@ -169,16 +170,16 @@ public class RenderEngine extends TileEntitySpecialRenderer implements IInventor
 
 		switch (energy) {
 		case Blue:
-			texture = "/net/minecraft/src/buildcraft/energy/gui/trunk_blue.png";
+			texture = DefaultProps.TEXTURE_PATH_BLOCKS + "/trunk_blue.png";
 			break;
 		case Green:
-			texture = "/net/minecraft/src/buildcraft/energy/gui/trunk_green.png";
+			texture = DefaultProps.TEXTURE_PATH_BLOCKS + "/trunk_green.png";
 			break;
 		case Yellow:
-			texture = "/net/minecraft/src/buildcraft/energy/gui/trunk_yellow.png";
+			texture = DefaultProps.TEXTURE_PATH_BLOCKS + "/trunk_yellow.png";
 			break;
 		default:
-			texture = "/net/minecraft/src/buildcraft/energy/gui/trunk_red.png";
+			texture = DefaultProps.TEXTURE_PATH_BLOCKS + "/trunk_red.png";
 			break;
 		}
 

buildcraft_client/net/minecraft/src/buildcraft/energy/TextureOilFlowFX.java

@@ -12,6 +12,7 @@ package net.minecraft.src.buildcraft.energy;
 import net.minecraft.src.BuildCraftCore;
 import net.minecraft.src.BuildCraftEnergy;
 import net.minecraft.src.RenderEngine;
+import net.minecraft.src.buildcraft.core.DefaultProps;
 
 import org.lwjgl.opengl.GL11;
 
@@ -38,7 +39,7 @@ public class TextureOilFlowFX extends FMLTextureFX {
 
 	@Override
 	public void bindImage(RenderEngine renderengine) {
-		GL11.glBindTexture(3553, renderengine.getTexture(BuildCraftCore.customBuildCraftTexture));
+		GL11.glBindTexture(3553, renderengine.getTexture(DefaultProps.TEXTURE_BLOCKS));
 	}
 
 	@Override

buildcraft_client/net/minecraft/src/buildcraft/factory/GuiHopper.java

@@ -2,6 +2,7 @@ package net.minecraft.src.buildcraft.factory;
 
 import net.minecraft.src.GuiContainer;
 import net.minecraft.src.InventoryPlayer;
+import net.minecraft.src.buildcraft.core.DefaultProps;
 
 import org.lwjgl.opengl.GL11;
 
@@ -14,7 +15,7 @@ public class GuiHopper extends GuiContainer {
 
 	@Override
 	protected void drawGuiContainerBackgroundLayer(float f, int x, int y) {
-		int i = mc.renderEngine.getTexture("/net/minecraft/src/buildcraft/factory/gui/hopper_gui.png");
+		int i = mc.renderEngine.getTexture(DefaultProps.TEXTURE_PATH_GUI + "/hopper_gui.png");
 		GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
 		mc.renderEngine.bindTexture(i);
 		int j = (width - xSize) / 2;

buildcraft_client/net/minecraft/src/buildcraft/factory/GuiRefinery.java

@@ -13,6 +13,7 @@ import net.minecraft.src.InventoryPlayer;
 import net.minecraft.src.ItemStack;
 import net.minecraft.src.buildcraft.api.BuildCraftAPI;
 import net.minecraft.src.buildcraft.api.RefineryRecipe;
+import net.minecraft.src.buildcraft.core.DefaultProps;
 import net.minecraft.src.buildcraft.core.GuiAdvancedInterface;
 import net.minecraft.src.buildcraft.core.utils.StringUtil;
 
@@ -50,7 +51,7 @@ public class GuiRefinery extends GuiAdvancedInterface {
 
 	@Override
 	protected void drawGuiContainerBackgroundLayer(float f, int x, int y) {
-		int i = mc.renderEngine.getTexture("/net/minecraft/src/buildcraft/factory/gui/refinery_filter.png");
+		int i = mc.renderEngine.getTexture(DefaultProps.TEXTURE_PATH_GUI + "/refinery_filter.png");
 		GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
 		mc.renderEngine.bindTexture(i);
 		int j = (width - xSize) / 2;

buildcraft_client/net/minecraft/src/buildcraft/factory/RenderHopper.java

@@ -7,6 +7,7 @@ import net.minecraft.src.ModelRenderer;
 import net.minecraft.src.Tessellator;
 import net.minecraft.src.TileEntity;
 import net.minecraft.src.TileEntitySpecialRenderer;
+import net.minecraft.src.buildcraft.core.DefaultProps;
 import net.minecraft.src.buildcraft.core.IInventoryRenderer;
 import net.minecraft.src.forge.MinecraftForgeClient;
 
@@ -52,10 +53,10 @@ public class RenderHopper extends TileEntitySpecialRenderer implements IInventor
 		GL11.glDisable(GL11.GL_LIGHTING);
 
 		GL11.glTranslated(x, y, z);
-		MinecraftForgeClient.bindTexture("/net/minecraft/src/buildcraft/factory/gui/hopper.png");
+		MinecraftForgeClient.bindTexture(DefaultProps.TEXTURE_PATH_BLOCKS + "/hopper.png");
 		top.render((float) (1.0 / 16.0));
 		bottom.render((float) (1.0 / 16.0));
-		MinecraftForgeClient.bindTexture("/net/minecraft/src/buildcraft/factory/gui/hopper_middle.png");
+		MinecraftForgeClient.bindTexture(DefaultProps.TEXTURE_PATH_BLOCKS + "/hopper_middle.png");
 		middle.render(Tessellator.instance, 1F / 16F);
 
 		GL11.glEnable(GL11.GL_LIGHTING);

buildcraft_client/net/minecraft/src/buildcraft/factory/RenderRefinery.java

@@ -19,6 +19,7 @@ import net.minecraft.src.ModelRenderer;
 import net.minecraft.src.TileEntity;
 import net.minecraft.src.TileEntitySpecialRenderer;
 import net.minecraft.src.World;
+import net.minecraft.src.buildcraft.core.DefaultProps;
 import net.minecraft.src.buildcraft.core.IInventoryRenderer;
 import net.minecraft.src.buildcraft.core.RenderEntityBlock;
 import net.minecraft.src.buildcraft.core.RenderEntityBlock.BlockInterface;
@@ -172,7 +173,7 @@ public class RenderRefinery extends TileEntitySpecialRenderer implements IInvent
 		GL11.glRotatef(angle, 0, 1, 0);
 		GL11.glTranslatef(-0.5F, -0.5F, -0.5F);
 
-		MinecraftForgeClient.bindTexture("/net/minecraft/src/buildcraft/factory/gui/refinery.png");
+		MinecraftForgeClient.bindTexture(DefaultProps.TEXTURE_PATH_BLOCKS + "/refinery.png");
 		GL11.glTranslatef(-4F * factor, 0, -4F * factor);
 		tank.render(factor);
 		GL11.glTranslatef(4F * factor, 0, 4F * factor);

buildcraft_client/net/minecraft/src/buildcraft/silicon/GuiAssemblyTable.java

@@ -17,6 +17,7 @@ import net.minecraft.src.ItemStack;
 import net.minecraft.src.buildcraft.api.APIProxy;
 import net.minecraft.src.buildcraft.core.AssemblyRecipe;
 import net.minecraft.src.buildcraft.core.CoreProxy;
+import net.minecraft.src.buildcraft.core.DefaultProps;
 import net.minecraft.src.buildcraft.core.GuiAdvancedInterface;
 import net.minecraft.src.buildcraft.core.network.PacketCoordinates;
 import net.minecraft.src.buildcraft.core.network.PacketIds;
@@ -71,7 +72,8 @@ public class GuiAssemblyTable extends GuiAdvancedInterface {
 		updateRecipes();
 
 		// Request current selection from server
-		CoreProxy.sendToServer(new PacketCoordinates(PacketIds.SELECTION_ASSEMBLY_GET, assemblyTable.xCoord,
+		if(APIProxy.isRemote())
+			CoreProxy.sendToServer(new PacketCoordinates(PacketIds.SELECTION_ASSEMBLY_GET, assemblyTable.xCoord,
 				assemblyTable.yCoord, assemblyTable.zCoord).getPacket());
 	}
 
@@ -97,7 +99,7 @@ public class GuiAssemblyTable extends GuiAdvancedInterface {
 
 	@Override
 	protected void drawGuiContainerBackgroundLayer(float f, int x, int y) {
-		int i = mc.renderEngine.getTexture("/net/minecraft/src/buildcraft/factory/gui/assembly_table.png");
+		int i = mc.renderEngine.getTexture(DefaultProps.TEXTURE_PATH_GUI + "/assembly_table.png");
 		GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
 		mc.renderEngine.bindTexture(i);
 		int cornerX = (width - xSize) / 2;

buildcraft_client/net/minecraft/src/buildcraft/transport/GuiDiamondPipe.java

@@ -13,6 +13,7 @@ import net.minecraft.src.IInventory;
 import net.minecraft.src.ItemStack;
 import net.minecraft.src.buildcraft.api.APIProxy;
 import net.minecraft.src.buildcraft.core.CoreProxy;
+import net.minecraft.src.buildcraft.core.DefaultProps;
 import net.minecraft.src.buildcraft.core.GuiAdvancedInterface;
 import net.minecraft.src.buildcraft.core.network.PacketIds;
 import net.minecraft.src.buildcraft.core.network.PacketSlotChange;
@@ -51,7 +52,7 @@ public class GuiDiamondPipe extends GuiAdvancedInterface {
 
 	@Override
 	protected void drawGuiContainerBackgroundLayer(float f, int x, int y) {
-		int i = mc.renderEngine.getTexture("/net/minecraft/src/buildcraft/transport/gui/filter.png");
+		int i = mc.renderEngine.getTexture(DefaultProps.TEXTURE_PATH_GUI + "/filter.png");
 		GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
 		mc.renderEngine.bindTexture(i);
 		int j = (width - xSize) / 2;

buildcraft_client/net/minecraft/src/buildcraft/transport/RenderPipe.java

@@ -28,6 +28,7 @@ import net.minecraft.src.TileEntitySpecialRenderer;
 import net.minecraft.src.World;
 import net.minecraft.src.buildcraft.api.EntityPassiveItem;
 import net.minecraft.src.buildcraft.api.Orientations;
+import net.minecraft.src.buildcraft.core.DefaultProps;
 import net.minecraft.src.buildcraft.core.RenderEntityBlock;
 import net.minecraft.src.buildcraft.core.RenderEntityBlock.BlockInterface;
 import net.minecraft.src.buildcraft.core.Utils;
@@ -237,7 +238,7 @@ public class RenderPipe extends TileEntitySpecialRenderer {
 		GL11.glPushMatrix();
 		GL11.glDisable(2896 /* GL_LIGHTING */);
 
-		MinecraftForgeClient.bindTexture(BuildCraftCore.customBuildCraftTexture);
+		MinecraftForgeClient.bindTexture(DefaultProps.TEXTURE_BLOCKS);
 
 		GL11.glTranslatef((float) x + 0.5F, (float) y + 0.5F, (float) z + 0.5F);
 

buildcraft_client/net/minecraft/src/mod_BuildCraftCore.java

@@ -85,9 +85,9 @@ public class mod_BuildCraftCore extends NetworkMod {
 		if (!initialized) {
 			initializeMarkerMatrix();
 
-			MinecraftForgeClient.preloadTexture(BuildCraftCore.customBuildCraftTexture);
-			MinecraftForgeClient.preloadTexture(BuildCraftCore.customBuildCraftSprites);
-			MinecraftForgeClient.preloadTexture(BuildCraftCore.externalBuildCraftTexture);
+			MinecraftForgeClient.preloadTexture(DefaultProps.TEXTURE_BLOCKS);
+			MinecraftForgeClient.preloadTexture(DefaultProps.TEXTURE_ITEMS);
+			MinecraftForgeClient.preloadTexture(DefaultProps.TEXTURE_EXTERNAL);
 
 			initialized = true;
 		}
@@ -195,7 +195,7 @@ public class mod_BuildCraftCore extends NetworkMod {
 		block.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F);
 
 		pipe.prepareTextureFor(Orientations.Unknown);
-		MinecraftForgeClient.bindTexture(BuildCraftCore.customBuildCraftTexture);
+		MinecraftForgeClient.bindTexture(DefaultProps.TEXTURE_BLOCKS);
 
 		if (pipe.isWired(IPipe.WireColor.Red)) {
 			pipe.setDrawingState(DrawingState.DrawingRedWire);

buildcraft_client/net/minecraft/src/mod_BuildCraftEnergy.java

@@ -34,11 +34,11 @@ public class mod_BuildCraftEnergy extends NetworkMod {
 		BuildCraftEnergy.initialize();
 
 		mod_BuildCraftCore.blockByEntityRenders.put(new EntityRenderIndex(BuildCraftEnergy.engineBlock, 0), new RenderEngine(
-				"/net/minecraft/src/buildcraft/energy/gui/base_wood.png"));
+				DefaultProps.TEXTURE_PATH_BLOCKS + "/base_wood.png"));
 		mod_BuildCraftCore.blockByEntityRenders.put(new EntityRenderIndex(BuildCraftEnergy.engineBlock, 1), new RenderEngine(
-				"/net/minecraft/src/buildcraft/energy/gui/base_stone.png"));
+				DefaultProps.TEXTURE_PATH_BLOCKS + "/base_stone.png"));
 		mod_BuildCraftCore.blockByEntityRenders.put(new EntityRenderIndex(BuildCraftEnergy.engineBlock, 2), new RenderEngine(
-				"/net/minecraft/src/buildcraft/energy/gui/base_iron.png"));
+				DefaultProps.TEXTURE_PATH_BLOCKS + "/base_iron.png"));
 
 		ModLoader.getMinecraftInstance().renderEngine.registerTextureFX(new TextureOilFX());
 		ModLoader.getMinecraftInstance().renderEngine.registerTextureFX(new TextureFuelFX());

common/net/minecraft/src/BuildCraftCore.java

@@ -116,14 +116,6 @@ public class BuildCraftCore {
 	public static Action actionOff = new ActionMachineControl(DefaultProps.ACTION_OFF, Mode.Off);
 	public static Action actionLoop = new ActionMachineControl(DefaultProps.ACTION_LOOP, Mode.Loop);
 
-	public static String customBuildCraftTexture = "/net/minecraft/src/buildcraft/core/gui/block_textures.png";
-
-	public static String externalBuildCraftTexture = "/net/minecraft/src/buildcraft/core/gui/external-textures.png";
-
-	public static String customBuildCraftSprites = "/net/minecraft/src/buildcraft/core/gui/item_textures.png";
-
-	public static String triggerTextures = "/net/minecraft/src/buildcraft/core/gui/trigger_textures.png";
-
 	public static LinkedList<AssemblyRecipe> assemblyRecipes = new LinkedList<AssemblyRecipe>();
 
 	public static boolean loadDefaultRecipes = true;

common/net/minecraft/src/buildcraft/builders/BlockArchitect.java

@@ -26,6 +26,7 @@ import net.minecraft.src.buildcraft.api.APIProxy;
 import net.minecraft.src.buildcraft.api.Orientations;
 import net.minecraft.src.buildcraft.api.Position;
 import net.minecraft.src.buildcraft.api.tools.IToolWrench;
+import net.minecraft.src.buildcraft.core.DefaultProps;
 import net.minecraft.src.buildcraft.core.GuiIds;
 import net.minecraft.src.buildcraft.core.Utils;
 import net.minecraft.src.forge.ITextureProvider;
@@ -50,7 +51,7 @@ public class BlockArchitect extends BlockContainer implements ITextureProvider {
 
 	@Override
 	public String getTextureFile() {
-		return BuildCraftCore.customBuildCraftTexture;
+		return DefaultProps.TEXTURE_BLOCKS;
 	}
 
 	@Override

common/net/minecraft/src/buildcraft/builders/BlockBlueprintLibrary.java

@@ -21,6 +21,7 @@ import net.minecraft.src.TileEntity;
 import net.minecraft.src.World;
 import net.minecraft.src.mod_BuildCraftBuilders;
 import net.minecraft.src.buildcraft.api.APIProxy;
+import net.minecraft.src.buildcraft.core.DefaultProps;
 import net.minecraft.src.buildcraft.core.GuiIds;
 import net.minecraft.src.forge.ITextureProvider;
 
@@ -33,7 +34,7 @@ public class BlockBlueprintLibrary extends BlockContainer implements ITexturePro
 
 	@Override
 	public String getTextureFile() {
-		return BuildCraftCore.customBuildCraftTexture;
+		return DefaultProps.TEXTURE_BLOCKS;
 	}
 
 	@Override

common/net/minecraft/src/buildcraft/builders/BlockBuilder.java

@@ -25,6 +25,7 @@ import net.minecraft.src.buildcraft.api.APIProxy;
 import net.minecraft.src.buildcraft.api.Orientations;
 import net.minecraft.src.buildcraft.api.Position;
 import net.minecraft.src.buildcraft.api.tools.IToolWrench;
+import net.minecraft.src.buildcraft.core.DefaultProps;
 import net.minecraft.src.buildcraft.core.GuiIds;
 import net.minecraft.src.buildcraft.core.Utils;
 import net.minecraft.src.forge.ITextureProvider;
@@ -50,7 +51,7 @@ public class BlockBuilder extends BlockContainer implements ITextureProvider {
 
 	@Override
 	public String getTextureFile() {
-		return BuildCraftCore.customBuildCraftTexture;
+		return DefaultProps.TEXTURE_BLOCKS;
 	}
 
 	@Override

common/net/minecraft/src/buildcraft/builders/BlockFiller.java

@@ -22,6 +22,7 @@ import net.minecraft.src.World;
 import net.minecraft.src.mod_BuildCraftBuilders;
 import net.minecraft.src.buildcraft.api.APIProxy;
 import net.minecraft.src.buildcraft.api.filler.IFillerPattern;
+import net.minecraft.src.buildcraft.core.DefaultProps;
 import net.minecraft.src.buildcraft.core.GuiIds;
 import net.minecraft.src.buildcraft.core.Utils;
 import net.minecraft.src.forge.ITextureProvider;
@@ -107,7 +108,7 @@ public class BlockFiller extends BlockContainer implements ITextureProvider {
 
 	@Override
 	public String getTextureFile() {
-		return BuildCraftCore.customBuildCraftTexture;
+		return DefaultProps.TEXTURE_BLOCKS;
 	}
 
 	@SuppressWarnings({ "unchecked", "rawtypes" })

common/net/minecraft/src/buildcraft/builders/BlockMarker.java

@@ -23,6 +23,7 @@ import net.minecraft.src.MovingObjectPosition;
 import net.minecraft.src.TileEntity;
 import net.minecraft.src.Vec3D;
 import net.minecraft.src.World;
+import net.minecraft.src.buildcraft.core.DefaultProps;
 import net.minecraft.src.buildcraft.core.Utils;
 import net.minecraft.src.forge.ITextureProvider;
 
@@ -218,7 +219,7 @@ public class BlockMarker extends BlockContainer implements ITextureProvider {
 
 	@Override
 	public String getTextureFile() {
-		return BuildCraftCore.customBuildCraftTexture;
+		return DefaultProps.TEXTURE_BLOCKS;
 	}
 
 	@SuppressWarnings({ "unchecked", "rawtypes" })

common/net/minecraft/src/buildcraft/builders/FillerFillAll.java

@@ -13,6 +13,7 @@ import net.minecraft.src.BuildCraftCore;
 import net.minecraft.src.ItemStack;
 import net.minecraft.src.TileEntity;
 import net.minecraft.src.buildcraft.api.IBox;
+import net.minecraft.src.buildcraft.core.DefaultProps;
 
 public class FillerFillAll extends FillerPattern {
 
@@ -31,7 +32,7 @@ public class FillerFillAll extends FillerPattern {
 
 	@Override
 	public String getTextureFile() {
-		return BuildCraftCore.customBuildCraftTexture;
+		return DefaultProps.TEXTURE_BLOCKS;
 	}
 
 	@Override

common/net/minecraft/src/buildcraft/builders/FillerFillPyramid.java

@@ -13,6 +13,7 @@ import net.minecraft.src.BuildCraftCore;
 import net.minecraft.src.ItemStack;
 import net.minecraft.src.TileEntity;
 import net.minecraft.src.buildcraft.api.IBox;
+import net.minecraft.src.buildcraft.core.DefaultProps;
 
 public class FillerFillPyramid extends FillerPattern {
 
@@ -60,7 +61,7 @@ public class FillerFillPyramid extends FillerPattern {
 
 	@Override
 	public String getTextureFile() {
-		return BuildCraftCore.customBuildCraftTexture;
+		return DefaultProps.TEXTURE_BLOCKS;
 	}
 
 	@Override

common/net/minecraft/src/buildcraft/builders/FillerFillStairs.java

@@ -13,6 +13,7 @@ import net.minecraft.src.BuildCraftCore;
 import net.minecraft.src.ItemStack;
 import net.minecraft.src.TileEntity;
 import net.minecraft.src.buildcraft.api.IBox;
+import net.minecraft.src.buildcraft.core.DefaultProps;
 
 public class FillerFillStairs extends FillerPattern {
 
@@ -192,7 +193,7 @@ public class FillerFillStairs extends FillerPattern {
 
 	@Override
 	public String getTextureFile() {
-		return BuildCraftCore.customBuildCraftTexture;
+		return DefaultProps.TEXTURE_BLOCKS;
 	}
 
 	@Override

common/net/minecraft/src/buildcraft/builders/FillerFillWalls.java

@@ -13,6 +13,7 @@ import net.minecraft.src.BuildCraftCore;
 import net.minecraft.src.ItemStack;
 import net.minecraft.src.TileEntity;
 import net.minecraft.src.buildcraft.api.IBox;
+import net.minecraft.src.buildcraft.core.DefaultProps;
 
 public class FillerFillWalls extends FillerPattern {
 
@@ -55,7 +56,7 @@ public class FillerFillWalls extends FillerPattern {
 
 	@Override
 	public String getTextureFile() {
-		return BuildCraftCore.customBuildCraftTexture;
+		return DefaultProps.TEXTURE_BLOCKS;
 	}
 
 	@Override

common/net/minecraft/src/buildcraft/builders/FillerFlattener.java

@@ -14,6 +14,7 @@ import net.minecraft.src.ItemStack;
 import net.minecraft.src.TileEntity;
 import net.minecraft.src.buildcraft.api.BuildCraftAPI;
 import net.minecraft.src.buildcraft.api.IBox;
+import net.minecraft.src.buildcraft.core.DefaultProps;
 
 public class FillerFlattener extends FillerPattern {
 
@@ -76,7 +77,7 @@ public class FillerFlattener extends FillerPattern {
 
 	@Override
 	public String getTextureFile() {
-		return BuildCraftCore.customBuildCraftTexture;
+		return DefaultProps.TEXTURE_BLOCKS;
 	}
 
 	@Override

common/net/minecraft/src/buildcraft/builders/FillerRemover.java

@@ -13,6 +13,7 @@ import net.minecraft.src.BuildCraftCore;
 import net.minecraft.src.ItemStack;
 import net.minecraft.src.TileEntity;
 import net.minecraft.src.buildcraft.api.IBox;
+import net.minecraft.src.buildcraft.core.DefaultProps;
 
 public class FillerRemover extends FillerPattern {
 
@@ -31,7 +32,7 @@ public class FillerRemover extends FillerPattern {
 
 	@Override
 	public String getTextureFile() {
-		return BuildCraftCore.customBuildCraftTexture;
+		return DefaultProps.TEXTURE_BLOCKS;
 	}
 
 	@Override

common/net/minecraft/src/buildcraft/core/ActionMachineControl.java

@@ -47,7 +47,7 @@ public class ActionMachineControl extends Action {
 
 	@Override
 	public String getTexture() {
-		return BuildCraftCore.triggerTextures;
+		return DefaultProps.TEXTURE_TRIGGERS;
 	}
 
 }

common/net/minecraft/src/buildcraft/core/ActionRedstoneOutput.java

@@ -30,6 +30,6 @@ public class ActionRedstoneOutput extends Action {
 
 	@Override
 	public String getTexture() {
-		return BuildCraftCore.triggerTextures;
+		return DefaultProps.TEXTURE_TRIGGERS;
 	}
 }

common/net/minecraft/src/buildcraft/core/BlockBuildCraft.java

@@ -30,7 +30,7 @@ public abstract class BlockBuildCraft extends BlockContainer implements ITexture
 
 	@Override
 	public String getTextureFile() {
-		return BuildCraftCore.customBuildCraftTexture;
+		return DefaultProps.TEXTURE_BLOCKS;
 	}
 
 }

common/net/minecraft/src/buildcraft/core/DefaultProps.java

@@ -17,7 +17,15 @@ public class DefaultProps {
 	public static String NET_CHANNEL_NAME = "BC";
 	public static int NETWORK_UPDATE_RANGE = 128;
 
-	public static String TEXTURE_ICONS = "/net/minecraft/src/buildcraft/core/gui/icons.png";
+	public static String TEXTURE_PATH_GUI = "/gfx/buildcraft/gui";
+	public static String TEXTURE_PATH_BLOCKS = "/gfx/buildcraft/blocks";
+	public static String TEXTURE_PATH_ENTITIES = "/gfx/buildcraft/entitites";
+	
+	public static String TEXTURE_BLOCKS = TEXTURE_PATH_BLOCKS + "/blocks.png";
+	public static String TEXTURE_EXTERNAL = TEXTURE_PATH_BLOCKS + "/external.png";
+	public static String TEXTURE_ITEMS = "/gfx/buildcraft/items/items.png";
+	public static String TEXTURE_ICONS = TEXTURE_PATH_GUI + "/icons.png";
+	public static String TEXTURE_TRIGGERS = TEXTURE_PATH_GUI + "/triggers.png";
 
 	public static int WOODEN_GEAR_ID = 3800;
 	public static int STONE_GEAR_ID = 3801;

common/net/minecraft/src/buildcraft/core/ItemBuildCraft.java

@@ -28,7 +28,7 @@ public class ItemBuildCraft extends Item implements ITextureProvider {
 
 	@Override
 	public String getTextureFile() {
-		return BuildCraftCore.customBuildCraftSprites;
+		return DefaultProps.TEXTURE_ITEMS;
 	}
 
 }

common/net/minecraft/src/buildcraft/core/TriggerInventory.java

@@ -114,6 +114,6 @@ public class TriggerInventory extends Trigger {
 
 	@Override
 	public String getTextureFile() {
-		return BuildCraftCore.triggerTextures;
+		return DefaultProps.TEXTURE_TRIGGERS;
 	}
 }

common/net/minecraft/src/buildcraft/core/TriggerLiquidContainer.java

@@ -123,6 +123,6 @@ public class TriggerLiquidContainer extends Trigger {
 
 	@Override
 	public String getTextureFile() {
-		return BuildCraftCore.triggerTextures;
+		return DefaultProps.TEXTURE_TRIGGERS;
 	}
 }

common/net/minecraft/src/buildcraft/core/TriggerMachine.java

@@ -56,6 +56,6 @@ public class TriggerMachine extends Trigger {
 
 	@Override
 	public String getTextureFile() {
-		return BuildCraftCore.triggerTextures;
+		return DefaultProps.TEXTURE_TRIGGERS;
 	}
 }

common/net/minecraft/src/buildcraft/energy/BlockOilFlowing.java

@@ -18,6 +18,7 @@ import net.minecraft.src.BuildCraftEnergy;
 import net.minecraft.src.Material;
 import net.minecraft.src.World;
 import net.minecraft.src.buildcraft.api.liquids.ILiquid;
+import net.minecraft.src.buildcraft.core.DefaultProps;
 import net.minecraft.src.forge.ITextureProvider;
 
 public class BlockOilFlowing extends BlockFluid implements ITextureProvider, ILiquid {
@@ -37,7 +38,7 @@ public class BlockOilFlowing extends BlockFluid implements ITextureProvider, ILi
 
 	@Override
 	public String getTextureFile() {
-		return BuildCraftCore.customBuildCraftTexture;
+		return DefaultProps.TEXTURE_BLOCKS;
 	}
 
 	private void func_30003_j(World world, int i, int j, int k) {

common/net/minecraft/src/buildcraft/energy/BlockOilStill.java

@@ -15,6 +15,7 @@ import net.minecraft.src.BuildCraftEnergy;
 import net.minecraft.src.Material;
 import net.minecraft.src.World;
 import net.minecraft.src.buildcraft.api.liquids.ILiquid;
+import net.minecraft.src.buildcraft.core.DefaultProps;
 import net.minecraft.src.forge.ITextureProvider;
 
 public class BlockOilStill extends BlockStationary implements ITextureProvider, ILiquid {
@@ -31,7 +32,7 @@ public class BlockOilStill extends BlockStationary implements ITextureProvider,
 
 	@Override
 	public String getTextureFile() {
-		return BuildCraftCore.customBuildCraftTexture;
+		return DefaultProps.TEXTURE_BLOCKS;
 	}
 
 	@Override

common/net/minecraft/src/buildcraft/energy/BlockPollution.java

@@ -14,6 +14,7 @@ import net.minecraft.src.BuildCraftCore;
 import net.minecraft.src.IBlockAccess;
 import net.minecraft.src.Material;
 import net.minecraft.src.TileEntity;
+import net.minecraft.src.buildcraft.core.DefaultProps;
 import net.minecraft.src.forge.ITextureProvider;
 
 public class BlockPollution extends BlockContainer implements ITextureProvider {
@@ -25,7 +26,7 @@ public class BlockPollution extends BlockContainer implements ITextureProvider {
 
 	@Override
 	public String getTextureFile() {
-		return BuildCraftCore.customBuildCraftTexture;
+		return DefaultProps.TEXTURE_BLOCKS;
 	}
 
 	@Override

common/net/minecraft/src/buildcraft/energy/EngineIron.java

@@ -17,6 +17,7 @@ import net.minecraft.src.buildcraft.api.BuildCraftAPI;
 import net.minecraft.src.buildcraft.api.IronEngineFuel;
 import net.minecraft.src.buildcraft.api.LiquidSlot;
 import net.minecraft.src.buildcraft.api.Orientations;
+import net.minecraft.src.buildcraft.core.DefaultProps;
 import net.minecraft.src.buildcraft.core.Utils;
 
 public class EngineIron extends Engine {
@@ -47,7 +48,7 @@ public class EngineIron extends Engine {
 
 	@Override
 	public String getTextureFile() {
-		return "/net/minecraft/src/buildcraft/energy/gui/base_iron.png";
+		return DefaultProps.TEXTURE_PATH_BLOCKS + "/base_iron.png";
 	}
 
 	@Override

common/net/minecraft/src/buildcraft/energy/EngineStone.java

@@ -16,6 +16,7 @@ import net.minecraft.src.ItemStack;
 import net.minecraft.src.Material;
 import net.minecraft.src.NBTTagCompound;
 import net.minecraft.src.buildcraft.core.CoreProxy;
+import net.minecraft.src.buildcraft.core.DefaultProps;
 import net.minecraft.src.buildcraft.core.Utils;
 
 public class EngineStone extends Engine {
@@ -32,7 +33,7 @@ public class EngineStone extends Engine {
 
 	@Override
 	public String getTextureFile() {
-		return "/net/minecraft/src/buildcraft/energy/gui/base_stone.png";
+		return DefaultProps.TEXTURE_PATH_BLOCKS + "/base_stone.png";
 	}
 
 	@Override

common/net/minecraft/src/buildcraft/energy/EngineWood.java

@@ -9,6 +9,8 @@
 
 package net.minecraft.src.buildcraft.energy;
 
+import net.minecraft.src.buildcraft.core.DefaultProps;
+
 public class EngineWood extends Engine {
 
 	public EngineWood(TileEngine engine) {
@@ -19,7 +21,7 @@ public class EngineWood extends Engine {
 
 	@Override
 	public String getTextureFile() {
-		return "/net/minecraft/src/buildcraft/energy/gui/base_wood.png";
+		return DefaultProps.TEXTURE_PATH_BLOCKS + "/base_wood.png";
 	}
 
 	@Override

common/net/minecraft/src/buildcraft/energy/ItemBucketOil.java

@@ -12,6 +12,7 @@ package net.minecraft.src.buildcraft.energy;
 import net.minecraft.src.BuildCraftEnergy;
 import net.minecraft.src.ItemBucket;
 import net.minecraft.src.ItemStack;
+import net.minecraft.src.buildcraft.core.DefaultProps;
 import net.minecraft.src.buildcraft.core.utils.StringUtil;
 import net.minecraft.src.forge.ITextureProvider;
 
@@ -29,7 +30,7 @@ public class ItemBucketOil extends ItemBucket implements ITextureProvider {
 
 	@Override
 	public String getTextureFile() {
-		return "/net/minecraft/src/buildcraft/core/gui/item_textures.png";
+		return DefaultProps.TEXTURE_ITEMS;
 	}
 
 }

common/net/minecraft/src/buildcraft/energy/TriggerEngineHeat.java

@@ -13,6 +13,7 @@ import net.minecraft.src.BuildCraftCore;
 import net.minecraft.src.TileEntity;
 import net.minecraft.src.buildcraft.api.Trigger;
 import net.minecraft.src.buildcraft.api.TriggerParameter;
+import net.minecraft.src.buildcraft.core.DefaultProps;
 
 public class TriggerEngineHeat extends Trigger {
 
@@ -65,6 +66,6 @@ public class TriggerEngineHeat extends Trigger {
 
 	@Override
 	public String getTextureFile() {
-		return BuildCraftCore.triggerTextures;
+		return DefaultProps.TEXTURE_TRIGGERS;
 	}
 }

common/net/minecraft/src/buildcraft/factory/BlockFrame.java

@@ -26,6 +26,7 @@ import net.minecraft.src.buildcraft.api.IBlockPipe;
 import net.minecraft.src.buildcraft.api.ILegacyPipeConnection;
 import net.minecraft.src.buildcraft.api.Orientations;
 import net.minecraft.src.buildcraft.api.Position;
+import net.minecraft.src.buildcraft.core.DefaultProps;
 import net.minecraft.src.buildcraft.core.Utils;
 import net.minecraft.src.forge.ITextureProvider;
 
@@ -279,7 +280,7 @@ public class BlockFrame extends Block implements ILegacyPipeConnection, IBlockPi
 
 	@Override
 	public String getTextureFile() {
-		return BuildCraftCore.customBuildCraftTexture;
+		return DefaultProps.TEXTURE_BLOCKS;
 	}
 
 	@Override

common/net/minecraft/src/buildcraft/factory/BlockMiningWell.java

@@ -19,6 +19,7 @@ import net.minecraft.src.TileEntity;
 import net.minecraft.src.World;
 import net.minecraft.src.buildcraft.api.Orientations;
 import net.minecraft.src.buildcraft.api.Position;
+import net.minecraft.src.buildcraft.core.DefaultProps;
 import net.minecraft.src.buildcraft.core.Utils;
 import net.minecraft.src.forge.ITextureProvider;
 
@@ -74,7 +75,7 @@ public class BlockMiningWell extends BlockMachineRoot implements ITextureProvide
 
 	@Override
 	public String getTextureFile() {
-		return BuildCraftCore.customBuildCraftTexture;
+		return DefaultProps.TEXTURE_BLOCKS;
 	}
 
 	@SuppressWarnings({ "unchecked", "rawtypes" })

common/net/minecraft/src/buildcraft/factory/BlockPlainPipe.java

@@ -20,6 +20,7 @@ import net.minecraft.src.Material;
 import net.minecraft.src.buildcraft.api.IBlockPipe;
 import net.minecraft.src.buildcraft.api.ILegacyPipeConnection;
 import net.minecraft.src.buildcraft.api.Orientations;
+import net.minecraft.src.buildcraft.core.DefaultProps;
 import net.minecraft.src.buildcraft.core.Utils;
 import net.minecraft.src.forge.ITextureProvider;
 
@@ -65,7 +66,7 @@ public class BlockPlainPipe extends Block implements ILegacyPipeConnection, IBlo
 
 	@Override
 	public String getTextureFile() {
-		return BuildCraftCore.customBuildCraftTexture;
+		return DefaultProps.TEXTURE_BLOCKS;
 	}
 
 	public float getHeightInPipe() {

common/net/minecraft/src/buildcraft/factory/BlockPump.java

@@ -17,6 +17,7 @@ import net.minecraft.src.ItemStack;
 import net.minecraft.src.Material;
 import net.minecraft.src.TileEntity;
 import net.minecraft.src.World;
+import net.minecraft.src.buildcraft.core.DefaultProps;
 import net.minecraft.src.buildcraft.core.Utils;
 import net.minecraft.src.forge.ITextureProvider;
 
@@ -36,7 +37,7 @@ public class BlockPump extends BlockContainer implements ITextureProvider {
 
 	@Override
 	public String getTextureFile() {
-		return BuildCraftCore.customBuildCraftTexture;
+		return DefaultProps.TEXTURE_BLOCKS;
 	}
 
 	@Override

common/net/minecraft/src/buildcraft/factory/BlockQuarry.java

@@ -20,6 +20,7 @@ import net.minecraft.src.TileEntity;
 import net.minecraft.src.World;
 import net.minecraft.src.buildcraft.api.Orientations;
 import net.minecraft.src.buildcraft.api.Position;
+import net.minecraft.src.buildcraft.core.DefaultProps;
 import net.minecraft.src.buildcraft.core.Utils;
 import net.minecraft.src.forge.ITextureProvider;
 
@@ -150,7 +151,7 @@ public class BlockQuarry extends BlockMachineRoot implements ITextureProvider {
 
 	@Override
 	public String getTextureFile() {
-		return BuildCraftCore.customBuildCraftTexture;
+		return DefaultProps.TEXTURE_BLOCKS;
 	}
 
 	@SuppressWarnings({ "unchecked", "rawtypes" })

common/net/minecraft/src/buildcraft/factory/BlockTank.java

@@ -21,6 +21,7 @@ import net.minecraft.src.TileEntity;
 import net.minecraft.src.World;
 import net.minecraft.src.buildcraft.api.BuildCraftAPI;
 import net.minecraft.src.buildcraft.api.Orientations;
+import net.minecraft.src.buildcraft.core.DefaultProps;
 import net.minecraft.src.buildcraft.core.Utils;
 import net.minecraft.src.forge.ITextureProvider;
 
@@ -55,7 +56,7 @@ public class BlockTank extends BlockContainer implements ITextureProvider {
 
 	@Override
 	public String getTextureFile() {
-		return BuildCraftCore.customBuildCraftTexture;
+		return DefaultProps.TEXTURE_BLOCKS;
 	}
 
 	@Override

common/net/minecraft/src/buildcraft/silicon/BlockAssemblyTable.java

@@ -11,6 +11,7 @@ import net.minecraft.src.TileEntity;
 import net.minecraft.src.World;
 import net.minecraft.src.mod_BuildCraftSilicon;
 import net.minecraft.src.buildcraft.api.APIProxy;
+import net.minecraft.src.buildcraft.core.DefaultProps;
 import net.minecraft.src.buildcraft.core.GuiIds;
 import net.minecraft.src.buildcraft.factory.TileAssemblyTable;
 import net.minecraft.src.forge.ITextureProvider;
@@ -70,7 +71,7 @@ public class BlockAssemblyTable extends BlockContainer implements ITextureProvid
 
 	@Override
 	public String getTextureFile() {
-		return BuildCraftCore.customBuildCraftTexture;
+		return DefaultProps.TEXTURE_BLOCKS;
 	}
 
 	@SuppressWarnings({ "unchecked", "rawtypes" })

common/net/minecraft/src/buildcraft/silicon/BlockLaser.java

@@ -19,6 +19,7 @@ import net.minecraft.src.Material;
 import net.minecraft.src.TileEntity;
 import net.minecraft.src.World;
 import net.minecraft.src.buildcraft.api.Orientations;
+import net.minecraft.src.buildcraft.core.DefaultProps;
 import net.minecraft.src.forge.ITextureProvider;
 
 public class BlockLaser extends BlockContainer implements ITextureProvider {
@@ -54,7 +55,7 @@ public class BlockLaser extends BlockContainer implements ITextureProvider {
 
 	@Override
 	public String getTextureFile() {
-		return BuildCraftCore.customBuildCraftTexture;
+		return DefaultProps.TEXTURE_BLOCKS;
 	}
 
 	@Override