Added mcmod.info for FML.

Small refactoring.

buildcraft_resources/mcmod.info

@@ -0,0 +1,104 @@
+[
+{
+  "modid": "mod_BuildCraftCore",
+  "name": "BuildCraft 3",
+  "description": "Extending Minecraft with pipes, auto-crafting, quarries, engines and much more!",
+  "version": "",
+  "credits": "Created by SpaceToad",
+  "logoFile": "/gfx/buildcraft/logo.png",
+  "mcversion": "",
+  "url": "http://http://www.mod-buildcraft.com//",
+  "updateUrl": "",
+  "authors": [ "SpaceToad", "Krapht", "SirSengir", "Others" ],
+  "parent":"",
+  "screenshots": [],
+  "dependencies": [
+     "mod_MinecraftForge"
+  ]
+},
+{
+  "modid": "mod_BuildCraftBuilders",
+  "name": "BC Builders",
+  "description": "Extending Minecraft with pipes, auto-crafting, quarries, engines and much more! (Builders Component)",
+  "version": "",
+  "credits": "Created by SpaceToad",
+  "logoFile": "/gfx/buildcraft/logo.png",
+  "mcversion": "",
+  "url": "http://http://www.mod-buildcraft.com//",
+  "updateUrl": "",
+  "authors": [ "SpaceToad", "Krapht", "SirSengir", "Others" ],
+  "parent": "mod_BuildCraftCore",
+  "screenshots": [],
+  "dependencies": [
+     "mod_MinecraftForge"
+  ]
+},
+{
+  "modid": "mod_BuildCraftEnergy",
+  "name": "BC Energy",
+  "description": "Extending Minecraft with pipes, auto-crafting, quarries, engines and much more! (Energy Component)",
+  "version": "",
+  "credits": "Created by SpaceToad",
+  "logoFile": "/gfx/buildcraft/logo.png",
+  "mcversion": "",
+  "url": "http://http://www.mod-buildcraft.com//",
+  "updateUrl": "",
+  "authors": [ "SpaceToad", "Krapht", "SirSengir", "Others" ],
+  "parent": "mod_BuildCraftCore",
+  "screenshots": [],
+  "dependencies": [
+     "mod_MinecraftForge"
+  ]
+},
+{
+  "modid": "mod_BuildCraftFactory",
+  "name": "BC Factory",
+  "description": "Extending Minecraft with pipes, auto-crafting, quarries, engines and much more! (Factory Component)",
+  "version": "",
+  "credits": "Created by SpaceToad",
+  "logoFile": "/gfx/buildcraft/logo.png",
+  "mcversion": "",
+  "url": "http://http://www.mod-buildcraft.com//",
+  "updateUrl": "",
+  "authors": [ "SpaceToad", "Krapht", "SirSengir", "Others" ],
+  "parent": "mod_BuildCraftCore",
+  "screenshots": [],
+  "dependencies": [
+     "mod_MinecraftForge"
+  ]
+},
+{
+  "modid": "mod_BuildCraftSilicon",
+  "name": "BC Silicon",
+  "description": "Extending Minecraft with pipes, auto-crafting, quarries, engines and much more! (Silicon Component)",
+  "version": "",
+  "credits": "Created by SpaceToad",
+  "logoFile": "/gfx/buildcraft/logo.png",
+  "mcversion": "",
+  "url": "http://http://www.mod-buildcraft.com//",
+  "updateUrl": "",
+  "authors": [ "SpaceToad", "Krapht", "SirSengir", "Others" ],
+  "parent": "mod_BuildCraftCore",
+  "screenshots": [],
+  "dependencies": [
+     "mod_MinecraftForge"
+  ]
+},
+{
+  "modid": "mod_BuildCraftTransport",
+  "name": "BC Transport",
+  "description": "Extending Minecraft with pipes, auto-crafting, quarries, engines and much more! (Transport Component)",
+  "version": "",
+  "credits": "Created by SpaceToad",
+  "logoFile": "/gfx/buildcraft/logo.png",
+  "mcversion": "",
+  "url": "http://http://www.mod-buildcraft.com//",
+  "updateUrl": "",
+  "authors": [ "SpaceToad", "Krapht", "SirSengir", "Others" ],
+  "parent": "mod_BuildCraftCore",
+  "screenshots": [],
+  "dependencies": [
+     "mod_MinecraftForge"
+  ]
+}
+]

buildcraft_resources/mod_BuildCraftBuilders.info

@@ -0,0 +1,19 @@
+[
+{
+  "modid": "mod_BuildCraftBuilders",
+  "name": "Builders",
+  "description": "Extending Minecraft with pipes, auto-crafting, quarries, engines and much more! (Builders Component)",
+  "version": "",
+  "credits": "Created by SpaceToad",
+  "logoFile": "/gfx/buildcraft/logo.png",
+  "mcversion": "",
+  "url": "http://http://www.mod-buildcraft.com//",
+  "updateUrl": "",
+  "authors": [ "SpaceToad", "Krapht", "SirSengir", "Others" ],
+  "parent": "mod_BuildCraftCore",
+  "screenshots": [],
+  "dependencies": [
+     "mod_MinecraftForge"
+  ]
+}
+]

buildcraft_resources/mod_BuildCraftCore.info

@@ -0,0 +1,19 @@
+[
+{
+  "modid": "mod_BuildCraftCore",
+  "name": "BuildCraft 3",
+  "description": "Extending Minecraft with pipes, auto-crafting, quarries, engines and much more!",
+  "version": "",
+  "credits": "Created by SpaceToad",
+  "logoFile": "/gfx/buildcraft/logo.png",
+  "mcversion": "",
+  "url": "http://http://www.mod-buildcraft.com//",
+  "updateUrl": "",
+  "authors": [ "SpaceToad", "Krapht", "SirSengir", "Others" ],
+  "parent":"",
+  "screenshots": [],
+  "dependencies": [
+     "mod_MinecraftForge"
+  ]
+}
+]

buildcraft_resources/mod_BuildCraftDevel.info

@@ -0,0 +1,19 @@
+[
+{
+  "modid": "mod_BuildCraftDevel",
+  "name": "Devel",
+  "description": "Extending Minecraft with pipes, auto-crafting, quarries, engines and much more! (Development Component)",
+  "version": "",
+  "credits": "Created by SpaceToad",
+  "logoFile": "/gfx/buildcraft/logo.png",
+  "mcversion": "",
+  "url": "http://http://www.mod-buildcraft.com//",
+  "updateUrl": "",
+  "authors": [ "SpaceToad", "Krapht", "SirSengir", "Others" ],
+  "parent": "mod_BuildCraftCore",
+  "screenshots": [],
+  "dependencies": [
+     "mod_MinecraftForge"
+  ]
+}
+]

buildcraft_resources/mod_BuildCraftEnergy.info

@@ -0,0 +1,19 @@
+[
+{
+  "modid": "mod_BuildCraftEnergy",
+  "name": "Energy",
+  "description": "Extending Minecraft with pipes, auto-crafting, quarries, engines and much more! (Energy Component)",
+  "version": "",
+  "credits": "Created by SpaceToad",
+  "logoFile": "/gfx/buildcraft/logo.png",
+  "mcversion": "",
+  "url": "http://http://www.mod-buildcraft.com//",
+  "updateUrl": "",
+  "authors": [ "SpaceToad", "Krapht", "SirSengir", "Others" ],
+  "parent": "mod_BuildCraftCore",
+  "screenshots": [],
+  "dependencies": [
+     "mod_MinecraftForge"
+  ]
+}
+]

buildcraft_resources/mod_BuildCraftFactory.info

@@ -0,0 +1,19 @@
+[
+{
+  "modid": "mod_BuildCraftFactory",
+  "name": "Factory",
+  "description": "Extending Minecraft with pipes, auto-crafting, quarries, engines and much more! (Factory Component)",
+  "version": "",
+  "credits": "Created by SpaceToad",
+  "logoFile": "/gfx/buildcraft/logo.png",
+  "mcversion": "",
+  "url": "http://http://www.mod-buildcraft.com//",
+  "updateUrl": "",
+  "authors": [ "SpaceToad", "Krapht", "SirSengir", "Others" ],
+  "parent": "mod_BuildCraftCore",
+  "screenshots": [],
+  "dependencies": [
+     "mod_MinecraftForge"
+  ]
+}
+]

buildcraft_resources/mod_BuildCraftSilicon.info

@@ -0,0 +1,19 @@
+[
+{
+  "modid": "mod_BuildCraftSilicon",
+  "name": "Silicon",
+  "description": "Extending Minecraft with pipes, auto-crafting, quarries, engines and much more! (Silicon Component)",
+  "version": "",
+  "credits": "Created by SpaceToad",
+  "logoFile": "/gfx/buildcraft/logo.png",
+  "mcversion": "",
+  "url": "http://http://www.mod-buildcraft.com//",
+  "updateUrl": "",
+  "authors": [ "SpaceToad", "Krapht", "SirSengir", "Others" ],
+  "parent": "mod_BuildCraftCore",
+  "screenshots": [],
+  "dependencies": [
+     "mod_MinecraftForge"
+  ]
+}
+]

buildcraft_resources/mod_BuildCraftTransport.info

@@ -0,0 +1,19 @@
+[
+{
+  "modid": "mod_BuildCraftTransport",
+  "name": "Transport",
+  "description": "Extending Minecraft with pipes, auto-crafting, quarries, engines and much more! (Transport Component)",
+  "version": "",
+  "credits": "Created by SpaceToad",
+  "logoFile": "/gfx/buildcraft/logo.png",
+  "mcversion": "",
+  "url": "http://http://www.mod-buildcraft.com//",
+  "updateUrl": "",
+  "authors": [ "SpaceToad", "Krapht", "SirSengir", "Others" ],
+  "parent": "mod_BuildCraftCore",
+  "screenshots": [],
+  "dependencies": [
+     "mod_MinecraftForge"
+  ]
+}
+]

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

@@ -3,14 +3,16 @@ package net.minecraft.src.buildcraft.core;
 import java.util.Random;
 
 import net.minecraft.src.BlockContainer;
+import net.minecraft.src.BuildCraftCore;
 import net.minecraft.src.EntityItem;
 import net.minecraft.src.IInventory;
 import net.minecraft.src.ItemStack;
 import net.minecraft.src.Material;
 import net.minecraft.src.World;
 import net.minecraft.src.buildcraft.api.APIProxy;
+import net.minecraft.src.forge.ITextureProvider;
 
-public abstract class BlockBuildCraft extends BlockContainer {
+public abstract class BlockBuildCraft extends BlockContainer implements ITextureProvider {
 
 	protected static boolean keepInventory = false;
 	protected Random rand;
@@ -22,44 +24,13 @@ public abstract class BlockBuildCraft extends BlockContainer {
 
 	@Override
 	public void onBlockRemoval(World world, int i, int j, int k) {
-
+		Utils.preDestroyBlock(world, i, j, k);
-		if (APIProxy.isRemote())
-			return;
-
-		if (!keepInventory) {
-
-			IInventory tile = (IInventory) world.getBlockTileEntity(i, j, k);
-			if (tile != null)
-				label0: for (int l = 0; l < tile.getSizeInventory(); l++) {
-
-					ItemStack itemstack = tile.getStackInSlot(l);
-					if (itemstack == null)
-						continue;
-
-					float f = rand.nextFloat() * 0.8F + 0.1F;
-					float f1 = rand.nextFloat() * 0.8F + 0.1F;
-					float f2 = rand.nextFloat() * 0.8F + 0.1F;
-
-					do {
-						if (itemstack.stackSize <= 0)
-							continue label0;
-						int i1 = rand.nextInt(21) + 10;
-						if (i1 > itemstack.stackSize)
-							i1 = itemstack.stackSize;
-						ItemStack drop = itemstack.splitStack(i1);
-						EntityItem entityitem = new EntityItem(world, i + f, j
-								+ f1, k + f2, drop);
-						float f3 = 0.05F;
-						entityitem.motionX = (float) rand.nextGaussian() * f3;
-						entityitem.motionY = (float) rand.nextGaussian() * f3
-								+ 0.2F;
-						entityitem.motionZ = (float) rand.nextGaussian() * f3;
-						world.spawnEntityInWorld(entityitem);
-
-					} while (true);
-				}
-		}
 		super.onBlockRemoval(world, i, j, k);
 	}
 
+	@Override
+	public String getTextureFile() {
+		return BuildCraftCore.customBuildCraftTexture;
+	}
+
 }

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

@@ -20,13 +20,13 @@ import net.minecraft.src.TileEntity;
 import net.minecraft.src.World;
 import net.minecraft.src.mod_BuildCraftFactory;
 import net.minecraft.src.buildcraft.api.APIProxy;
+import net.minecraft.src.buildcraft.core.BlockBuildCraft;
 import net.minecraft.src.buildcraft.core.GuiIds;
 import net.minecraft.src.buildcraft.core.IItemPipe;
 import net.minecraft.src.buildcraft.core.Utils;
 import net.minecraft.src.forge.ITextureProvider;
 
-public class BlockAutoWorkbench extends BlockContainer implements
+public class BlockAutoWorkbench extends BlockBuildCraft {
-		ITextureProvider {
 
 	int topTexture;
 	int sideTexture;
@@ -74,18 +74,6 @@ public class BlockAutoWorkbench extends BlockContainer implements
 		return new TileAutoWorkbench();
 	}
 
-	@Override
-	public void onBlockRemoval(World world, int i, int j, int k) {
-		Utils.preDestroyBlock(world, i, j, k);
-
-		super.onBlockRemoval(world, i, j, k);
-	}
-
-	@Override
-	public String getTextureFile() {
-		return BuildCraftCore.customBuildCraftTexture;
-	}
-
 	@SuppressWarnings({ "unchecked", "rawtypes" })
 	@Override
 	public void addCreativeItems(ArrayList itemList) {