Screwdriver driven development. (#124)

* Added NEI handler for TGS.
Added BoP support to TGS.
Added base work for LFH.

* Added Witchery support to TGS.

* Finished LFH.
Added missing steam multiblock.
Fixed GT++ NEI time values not being precise enough.

* Implement Fert use in TGS.

* Fix broken checkRecipes.
Did initial work for XLHE.
Other misc. stuff.

* Update GregtechLargeTurbinesAndHeatExchanger.java

* Update RECIPES_Machines.java

Changes requested by @Dream-Master

3 files changed, 19 insertions, 8 deletions

diff --git a/src/main/java/gtPlusPlus/core/block/ModBlocks.java b/src/main/java/gtPlusPlus/core/block/ModBlocks.java
index 5b29d9a636..4842cb891e 100644
--- a/src/main/java/gtPlusPlus/core/block/ModBlocks.java
+++ b/src/main/java/gtPlusPlus/core/block/ModBlocks.java
@@ -61,6 +61,7 @@ public final class ModBlocks {
 	public static Block blockSpecialMultiCasings;
 	public static Block blockSpecialMultiCasings2;
 	public static Block blockCustomMachineCasings;
+	public static Block blockCustomPipeGearCasings;	
 	
 	public static Block blockMetaTileEntity;
 	public static Block blockHeliumGenerator;
diff --git a/src/main/java/gtPlusPlus/core/block/base/BlockBaseModular.java b/src/main/java/gtPlusPlus/core/block/base/BlockBaseModular.java
index 035b13dfbf..2dc780bb78 100644
--- a/src/main/java/gtPlusPlus/core/block/base/BlockBaseModular.java
+++ b/src/main/java/gtPlusPlus/core/block/base/BlockBaseModular.java
@@ -17,6 +17,7 @@ import gtPlusPlus.core.material.Material;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.math.MathUtils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
+import net.minecraft.block.Block;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.item.ItemStack;
 import net.minecraft.world.IBlockAccess;
@@ -29,6 +30,12 @@ public class BlockBaseModular extends BasicBlock {
 	public BlockTypes thisBlock;
 	protected String thisBlockMaterial;
 	protected final String thisBlockType;
+	
+	private static HashMap<String, Block> sBlockCache = new HashMap<String, Block>();
+	
+	public static Block getMaterialBlock(Material aMaterial, BlockTypes aType) {
+		return sBlockCache.get(aMaterial.getUnlocalizedName()+"."+aType.name());
+	}
 
 	public BlockBaseModular(final Material material, final BlockTypes blockType) {
 		this(material, blockType, material.getRgbAsHex());
@@ -39,6 +46,9 @@ public class BlockBaseModular extends BasicBlock {
 				blockType, colour, Math.min(Math.max(material.vTier, 1), 6));
 		blockMaterial = material;
 		registerComponent();
+		if (material != null) {
+			sBlockCache.put(material.getUnlocalizedName()+"."+blockType.name(), this);
+		}
 	}
 
 	protected BlockBaseModular(final String unlocalizedName, final String blockMaterialString,
diff --git a/src/main/java/gtPlusPlus/core/block/base/BlockBaseOre.java b/src/main/java/gtPlusPlus/core/block/base/BlockBaseOre.java
index e1bc3462be..df69a050a6 100644
--- a/src/main/java/gtPlusPlus/core/block/base/BlockBaseOre.java
+++ b/src/main/java/gtPlusPlus/core/block/base/BlockBaseOre.java
@@ -7,8 +7,6 @@ import gregtech.api.enums.OrePrefixes;
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.IIconContainer;
 import gregtech.api.interfaces.ITexture;
-import gregtech.api.objects.GT_CopiedBlockTexture;
-import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.util.GT_OreDictUnificator;
 import gtPlusPlus.api.interfaces.ITexturedBlock;
 import gtPlusPlus.core.client.renderer.CustomOreBlockRenderer;
@@ -18,6 +16,8 @@ import gtPlusPlus.core.material.Material;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 import gtPlusPlus.core.util.reflect.ReflectionUtils;
+import gtPlusPlus.xmod.gregtech.api.objects.GTPP_CopiedBlockTexture;
+import gtPlusPlus.xmod.gregtech.api.objects.GTPP_RenderedTexture;
 import net.minecraft.block.Block;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.EnumCreatureType;
@@ -93,9 +93,9 @@ public class BlockBaseOre extends BasicBlock implements ITexturedBlock {
 
 	public ITexture[] getTexture(Block block, byte side) {
 		if (this.blockMaterial != null){
-			GT_RenderedTexture aIconSet = new GT_RenderedTexture(blockMaterial.getTextureSet().mTextures[OrePrefixes.ore.mTextureIndex], this.blockMaterial.getRGBA());
+			GTPP_RenderedTexture aIconSet = new GTPP_RenderedTexture(blockMaterial.getTextureSet().mTextures[OrePrefixes.ore.mTextureIndex], this.blockMaterial.getRGBA());
 			if (aIconSet != null){
-				return new ITexture[]{new GT_CopiedBlockTexture(Blocks.stone, 0, 0), aIconSet};				
+				return new ITexture[]{new GTPP_CopiedBlockTexture(Blocks.stone, 0, 0), aIconSet};				
 			}
 		}
 
@@ -118,7 +118,7 @@ public class BlockBaseOre extends BasicBlock implements ITexturedBlock {
 				}
 			}
 		}
-		return new ITexture[]{new GT_RenderedTexture(hiddenTextureArray[0], new short[]{240, 240, 240, 0})};
+		return new ITexture[]{new GTPP_RenderedTexture(hiddenTextureArray[0], new short[]{240, 240, 240, 0})};
 	}
 
 	@Override
@@ -196,9 +196,9 @@ public class BlockBaseOre extends BasicBlock implements ITexturedBlock {
 
 		public ITexture[] getTexture(Block block, byte side) {
 			if (this.blockMaterial != null){
-				GT_RenderedTexture aIconSet = new GT_RenderedTexture(blockMaterial.getTextureSet().mTextures[OrePrefixes.ore.mTextureIndex], this.blockMaterial.getRGBA());
+				GTPP_RenderedTexture aIconSet = new GTPP_RenderedTexture(blockMaterial.getTextureSet().mTextures[OrePrefixes.ore.mTextureIndex], this.blockMaterial.getRGBA());
 				if (aIconSet != null){
-					return new ITexture[]{new GT_CopiedBlockTexture(Blocks.stone, 0, 0), aIconSet};				
+					return new ITexture[]{new GTPP_CopiedBlockTexture(Blocks.stone, 0, 0), aIconSet};				
 				}
 			}
 
@@ -221,7 +221,7 @@ public class BlockBaseOre extends BasicBlock implements ITexturedBlock {
 					}
 				}
 			}
-			return new ITexture[]{new GT_RenderedTexture(hiddenTextureArray[0], new short[]{240, 240, 240, 0})};
+			return new ITexture[]{new GTPP_RenderedTexture(hiddenTextureArray[0], new short[]{240, 240, 240, 0})};
 		}
 
 	}