> Why does Git make me do these? arghhh...

Merge branch 'master' of https://github.com/draknyte1/GTplusplus

# Conflicts:
#	src/Java/gtPlusPlus/core/material/ALLOY.java
#	src/Java/gtPlusPlus/core/material/ELEMENT.java
#	src/Java/gtPlusPlus/core/material/Material.java
#	src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Recycling.java

8 files changed, 124 insertions, 16 deletions

diff --git a/src/Java/gtPlusPlus/core/block/ModBlocks.java b/src/Java/gtPlusPlus/core/block/ModBlocks.java
index 81d3a84dc9..cbd21a8888 100644
--- a/src/Java/gtPlusPlus/core/block/ModBlocks.java
+++ b/src/Java/gtPlusPlus/core/block/ModBlocks.java
@@ -1,6 +1,7 @@
 package gtPlusPlus.core.block;
 
 import cpw.mods.fml.common.registry.GameRegistry;
+import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.block.base.BasicBlock.BlockTypes;
 import gtPlusPlus.core.block.base.BlockBaseOre;
 import gtPlusPlus.core.block.general.BlockCompressedObsidian;
@@ -66,7 +67,7 @@ public final class ModBlocks {
 	public static Block blockNet;
 
 	public static void init() {
-		Utils.LOG_INFO("Initializing Blocks.");
+		Logger.INFO("Initializing Blocks.");
 		//blockGriefSaver = new TowerDevice().setBlockName("blockGriefSaver").setCreativeTab(AddToCreativeTab.tabBlock).setBlockTextureName("blockDefault");
 
 		registerBlocks();
@@ -74,7 +75,7 @@ public final class ModBlocks {
 
 	public static void registerBlocks(){
 
-		Utils.LOG_INFO("Registering Blocks.");
+		Logger.INFO("Registering Blocks.");
 		GameRegistry.registerBlock(MatterFabricatorEffectBlock = new LightGlass(Material.glass, false).setHardness(0.1F).setBlockTextureName(CORE.MODID + ":" + "blockMFEffect").setStepSound(Block.soundTypeGlass), "blockMFEffect");
 
 		//Fluids
diff --git a/src/Java/gtPlusPlus/core/block/base/BlockBaseFluid.java b/src/Java/gtPlusPlus/core/block/base/BlockBaseFluid.java
new file mode 100644
index 0000000000..6f837e8709
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/block/base/BlockBaseFluid.java
@@ -0,0 +1,102 @@
+package gtPlusPlus.core.block.base;
+
+import java.util.Random;
+
+import cofh.lib.render.particle.EntityDropParticleFX;
+import cpw.mods.fml.client.FMLClientHandler;
+import cpw.mods.fml.common.Optional;
+import cpw.mods.fml.common.registry.GameRegistry;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.item.base.itemblock.ItemBlockMeta;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.Utils;
+import net.minecraft.block.material.Material;
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.entity.EnumCreatureType;
+import net.minecraft.util.IIcon;
+import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.World;
+import net.minecraftforge.common.util.ForgeDirection;
+import net.minecraftforge.fluids.BlockFluidClassic;
+import net.minecraftforge.fluids.Fluid;
+
+public class BlockBaseFluid extends BlockFluidClassic {
+
+	private final String name;
+	private final IIcon textureArray[] = new IIcon[6];
+	
+	protected float particleRed = 1.0F;
+	protected float particleGreen = 1.0F;
+	protected float particleBlue = 1.0F;
+	
+	public BlockBaseFluid(String materialName, Fluid fluid, Material material) {
+		super(fluid, material);
+		this.setLightOpacity(2);
+		this.name = Utils.sanitizeString(materialName);
+		this.setBlockName("fluid"+this.name);
+		this.setCreativeTab(AddToCreativeTab.tabBlock);
+		GameRegistry.registerBlock(this, ItemBlockMeta.class, "fluid"+this.name);
+	}
+
+	public BlockFluidClassic setParticleColor(int arg0) {
+		return this.setParticleColor((arg0 >> 16 & 255) / 255.0F, (arg0 >> 8 & 255) / 255.0F,
+				(arg0 >> 0 & 255) / 255.0F);
+	}
+
+	public BlockFluidClassic setParticleColor(float arg0, float arg1, float arg2) {
+		this.particleRed = arg0;
+		this.particleGreen = arg1;
+		this.particleBlue = arg2;
+		return this;
+	}
+
+	@Override
+	public boolean canCreatureSpawn(EnumCreatureType arg0, IBlockAccess arg1, int arg2, int arg3, int arg4) {
+		return false;
+	}
+
+	public boolean preInit() {
+		return true;
+	}
+
+	@Override
+	@SideOnly(Side.CLIENT)
+	public IIcon getIcon(int side, int meta) {
+		return side <= 1 ? this.textureArray[0] : this.textureArray[1];
+	}
+
+	@Override
+	@SideOnly(Side.CLIENT)
+	public void registerBlockIcons(IIconRegister iicon) {
+		this.textureArray[0] = iicon.registerIcon(CORE.MODID + ":" + "fluid/" + "Fluid_" + this.name + "_Still");
+		this.textureArray[1] = iicon.registerIcon(CORE.MODID + ":" + "fluid/" + "Fluid_" + this.name + "_Flow");
+		//IconRegistry.addIcon("Fluid" + this.name, this.modName + ":fluid/Fluid_" + this.name + "_Still", arg0);
+		//IconRegistry.addIcon("Fluid" + this.name + "1", this.modName + ":fluid/Fluid_" + this.name + "_Flow", arg0);
+	}
+
+	@Override
+	@Optional.Method(modid = "CoFHCore")
+	@SideOnly(Side.CLIENT)
+	public void randomDisplayTick(World arg0, int arg1, int arg2, int arg3, Random arg4) {
+		super.randomDisplayTick(arg0, arg1, arg2, arg3, arg4);
+		double arg5 = arg1 + arg4.nextFloat();
+		double arg7 = arg2 - 1.05D;
+		double arg9 = arg3 + arg4.nextFloat();
+		if (super.density < 0) {
+			arg7 = arg2 + 2.1D;
+		}
+
+		if (arg4.nextInt(20) == 0
+				&& arg0.isSideSolid(arg1, arg2 + super.densityDir, arg3,
+						super.densityDir == -1 ? ForgeDirection.UP : ForgeDirection.DOWN)
+				&& !arg0.getBlock(arg1, arg2 + 2 * super.densityDir, arg3).getMaterial().blocksMovement()) {
+			EntityDropParticleFX arg11 = new EntityDropParticleFX(arg0, arg5, arg7, arg9, this.particleRed,
+					this.particleGreen, this.particleBlue, super.densityDir);
+			FMLClientHandler.instance().getClient().effectRenderer.addEffect(arg11);
+		}
+
+	}
+
+}
diff --git a/src/Java/gtPlusPlus/core/block/base/BlockBaseModular.java b/src/Java/gtPlusPlus/core/block/base/BlockBaseModular.java
index ff2f06d2d2..9c58e1a930 100644
--- a/src/Java/gtPlusPlus/core/block/base/BlockBaseModular.java
+++ b/src/Java/gtPlusPlus/core/block/base/BlockBaseModular.java
@@ -8,26 +8,31 @@ import gregtech.api.util.GT_OreDictUnificator;
 import gtPlusPlus.core.item.base.itemblock.ItemBlockGtBlock;
 import gtPlusPlus.core.item.base.itemblock.ItemBlockGtFrameBox;
 import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.material.Material;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.item.ItemUtils;
 import gtPlusPlus.core.util.math.MathUtils;
-import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.world.IBlockAccess;
 
 public class BlockBaseModular extends BasicBlock{
 
+	protected Material blockMaterial;
+	
 	protected int blockColour;
 	protected BlockTypes thisBlock;
 	protected String thisBlockMaterial;
 	protected final String thisBlockType;
 
-
+	public BlockBaseModular(final Material material, final BlockTypes blockType, final int colour) {
+		this(material.getUnlocalizedName(), material.getLocalizedName(), net.minecraft.block.material.Material.iron, blockType, colour, 2);
+	}
+	
 	public BlockBaseModular(final String unlocalizedName, final String blockMaterial,  final BlockTypes blockType, final int colour) {
-		this(unlocalizedName, blockMaterial, Material.iron, blockType, colour, 2);
+		this(unlocalizedName, blockMaterial, net.minecraft.block.material.Material.iron, blockType, colour, 2);
 	}
 
-	public BlockBaseModular(final String unlocalizedName, final String blockMaterial, final Material vanillaMaterial,  final BlockTypes blockType, final int colour, final int miningLevel) {
+	public BlockBaseModular(final String unlocalizedName, final String blockMaterial, final net.minecraft.block.material.Material vanillaMaterial,  final BlockTypes blockType, final int colour, final int miningLevel) {
 		super(unlocalizedName, vanillaMaterial);
 		this.setHarvestLevel(blockType.getHarvestTool(), miningLevel);
 		this.setBlockTextureName(CORE.MODID+":"+blockType.getTexture());
diff --git a/src/Java/gtPlusPlus/core/block/general/antigrief/TowerDevice.java b/src/Java/gtPlusPlus/core/block/general/antigrief/TowerDevice.java
index 8ac4e2df8d..ea3d9c3ee9 100644
--- a/src/Java/gtPlusPlus/core/block/general/antigrief/TowerDevice.java
+++ b/src/Java/gtPlusPlus/core/block/general/antigrief/TowerDevice.java
@@ -7,10 +7,10 @@ import java.util.Random;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.creative.AddToCreativeTab;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.tileentities.general.TileEntityReverter;
-import gtPlusPlus.core.util.Utils;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
@@ -266,7 +266,7 @@ public class TowerDevice extends Block {
 	public TileEntity createTileEntity(final World world, final int metadata)
 	{
 		if (metadata == 0) {
-			Utils.LOG_INFO("I have been created. [Antigriefer]"+this.getLocalizedName());
+			Logger.INFO("I have been created. [Antigriefer]"+this.getLocalizedName());
 			return new TileEntityReverter();
 		}
 		return null;
diff --git a/src/Java/gtPlusPlus/core/block/machine/Machine_ModularityTable.java b/src/Java/gtPlusPlus/core/block/machine/Machine_ModularityTable.java
index 1b4c5ebd01..bd41980325 100644
--- a/src/Java/gtPlusPlus/core/block/machine/Machine_ModularityTable.java
+++ b/src/Java/gtPlusPlus/core/block/machine/Machine_ModularityTable.java
@@ -5,10 +5,10 @@ import cpw.mods.fml.common.registry.LanguageRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gtPlusPlus.GTplusplus;
+import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.creative.AddToCreativeTab;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.tileentities.machines.TileEntityModularityTable;
-import gtPlusPlus.core.util.Utils;
 import net.minecraft.block.BlockContainer;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
@@ -70,7 +70,7 @@ public class Machine_ModularityTable extends BlockContainer
 		final TileEntity te = world.getTileEntity(x, y, z);
 		if ((te != null) && (te instanceof TileEntityModularityTable)){
 			player.openGui(GTplusplus.instance, 1, world, x, y, z);
-			Utils.LOG_INFO("Player opened GUI");
+			Logger.INFO("Player opened GUI");
 			return true;
 		}
 		return false;
diff --git a/src/Java/gtPlusPlus/core/block/machine/Machine_ProjectTable.java b/src/Java/gtPlusPlus/core/block/machine/Machine_ProjectTable.java
index 939015adf7..712d32aba7 100644
--- a/src/Java/gtPlusPlus/core/block/machine/Machine_ProjectTable.java
+++ b/src/Java/gtPlusPlus/core/block/machine/Machine_ProjectTable.java
@@ -6,11 +6,11 @@ import cpw.mods.fml.common.registry.LanguageRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gtPlusPlus.GTplusplus;
+import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.creative.AddToCreativeTab;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.lib.LoadedMods;
 import gtPlusPlus.core.tileentities.machines.TileEntityProjectTable;
-import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.player.PlayerUtils;
 import gtPlusPlus.core.util.reflect.ReflectionUtils;
 import ic2.core.item.tool.ItemToolWrench;
@@ -95,7 +95,7 @@ public class Machine_ProjectTable extends BlockContainer
 				player.openGui(GTplusplus.instance, 0, world, x, y, z);
 				return true;
 			}
-			Utils.LOG_INFO("Holding a Wrench, doing wrench things instead.");
+			Logger.INFO("Holding a Wrench, doing wrench things instead.");
 		}
 		return false;
 	}
diff --git a/src/Java/gtPlusPlus/core/block/machine/Machine_TradeTable.java b/src/Java/gtPlusPlus/core/block/machine/Machine_TradeTable.java
index 724b438b13..4cad0977ed 100644
--- a/src/Java/gtPlusPlus/core/block/machine/Machine_TradeTable.java
+++ b/src/Java/gtPlusPlus/core/block/machine/Machine_TradeTable.java
@@ -3,10 +3,10 @@ package gtPlusPlus.core.block.machine;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gtPlusPlus.GTplusplus;
+import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.block.base.BlockBaseNBT;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.tileentities.machines.TileEntityTradeTable;
-import gtPlusPlus.core.util.Utils;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.EnumCreatureType;
@@ -55,7 +55,7 @@ public class Machine_TradeTable extends BlockBaseNBT
 			return true;
 		}
 		else {
-			Utils.LOG_INFO("Bad TE");
+			Logger.INFO("Bad TE");
 		}
 		return false;
 	}
diff --git a/src/Java/gtPlusPlus/core/block/machine/Machine_Workbench.java b/src/Java/gtPlusPlus/core/block/machine/Machine_Workbench.java
index b5c54ad9a8..06df4ca480 100644
--- a/src/Java/gtPlusPlus/core/block/machine/Machine_Workbench.java
+++ b/src/Java/gtPlusPlus/core/block/machine/Machine_Workbench.java
@@ -6,11 +6,11 @@ import cpw.mods.fml.common.registry.LanguageRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gtPlusPlus.GTplusplus;
+import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.creative.AddToCreativeTab;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.lib.LoadedMods;
 import gtPlusPlus.core.tileentities.machines.TileEntityWorkbench;
-import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.player.PlayerUtils;
 import gtPlusPlus.core.util.reflect.ReflectionUtils;
 import ic2.core.item.tool.ItemToolWrench;
@@ -95,7 +95,7 @@ public class Machine_Workbench extends BlockContainer
 				player.openGui(GTplusplus.instance, 3, world, x, y, z);
 				return true;
 			}
-			Utils.LOG_INFO("Holding a Wrench, doing wrench things instead.");
+			Logger.INFO("Holding a Wrench, doing wrench things instead.");
 		}
 		return false;
 	}