% Refactored the entire project to stop using MiscUtils everywhere possible, now it's gtPlusPlus.

19 files changed, 2128 insertions, 0 deletions

diff --git a/src/Java/gtPlusPlus/core/block/ModBlocks.java b/src/Java/gtPlusPlus/core/block/ModBlocks.java
new file mode 100644
index 0000000000..ceb8880299
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/block/ModBlocks.java
@@ -0,0 +1,78 @@
+package gtPlusPlus.core.block;
+
+import gtPlusPlus.core.block.general.LightGlass;
+import gtPlusPlus.core.block.general.fluids.FluidRegistryHandler;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.xmod.gregtech.common.blocks.GregtechMetaCasingBlocks;
+import net.minecraft.block.Block;
+import net.minecraft.block.material.Material;
+import net.minecraftforge.fluids.Fluid;
+import cpw.mods.fml.common.registry.GameRegistry;
+
+public final class ModBlocks {
+
+	//Blocks
+	//public static Block blockBloodSteel;
+	//public static Block blockStaballoy;
+	// WIP TODO public static Block blockToolBuilder;
+	public static Block blockGriefSaver;
+	public static Block blockCasingsMisc;
+	public static Block blockHeliumGenerator;
+	public static Block blockNHG;
+	public static Block blockCharger;
+
+	public static Block MatterFabricatorEffectBlock;
+
+	public static Fluid fluidJackDaniels = new Fluid("fluidJackDaniels");
+	public static Block blockFluidJackDaniels; 
+	public static Block blockGtFrameStaballoy;
+	public static Block blockGtFrameTantalloy60;
+	public static Block blockGtFrameTantalloy61;
+
+
+
+	public static void init() {
+		Utils.LOG_INFO("Initializing Blocks.");
+		//blockGriefSaver = new TowerDevice().setBlockName("blockGriefSaver").setCreativeTab(AddToCreativeTab.tabBlock).setBlockTextureName("blockDefault");
+
+		registerBlocks(); 
+	}
+
+	public static void registerBlocks(){
+
+		Utils.LOG_INFO("Registering Blocks.");
+
+		//Blood Steel Block
+		//GameRegistry.registerBlock(blockBloodSteel = new BasicBlock("blockBloodSteel", Material.iron), "blockBloodSteel");
+
+		//Staballoy Block
+		//GameRegistry.registerBlock(blockStaballoy = new BasicBlock("blockStaballoy", Material.iron), "blockStaballoy");
+
+		//GameRegistry.registerBlock(MatterFabricatorEffectBlock = new MatterFabricatorEffectBlock(), "blockMF_Effect");
+
+		GameRegistry.registerBlock(MatterFabricatorEffectBlock = new LightGlass(Material.glass, false).setHardness(0.1F).setBlockTextureName(CORE.MODID + ":" + "blockMFEffect").setStepSound(Block.soundTypeGlass), "blockMFEffect");
+
+
+		//Casing Blocks
+		blockCasingsMisc = new GregtechMetaCasingBlocks();
+
+		//Fluids
+		FluidRegistryHandler.registerFluids();
+
+		// blockHeliumGenerator = GameRegistry.registerBlock(new HeliumGenerator(), "Helium_Collector");
+		// blockNHG = GameRegistry.registerBlock(new Machine_NHG("blockNuclearFueledHeliumGenerator"), "blockNuclearFueledHeliumGenerator");
+		// blockCharger = GameRegistry.registerBlock(new Machine_Charger("blockMachineCharger"), "blockMachineCharger");
+
+
+		//WIP TODO
+		//GameRegistry.registerBlock(blockGriefSaver, "blockGriefSaver");
+
+		//GtFrames
+		//GameRegistry.registerBlock(blockGtFrameSet1 = new BlockGtFrameBox("blockGtFrameSet1", Material.iron ,BlockTypes.FRAME, true, Utils.rgbtoHexValue(68, 75, 66), Utils.rgbtoHexValue(68, 75, 166), Utils.rgbtoHexValue(122, 135, 196)), "blockGtFrameSet1");
+		//GameRegistry.registerBlock(blockGtFrameTantalloy60 = new BlockBaseModular("blockGtFrameStaballoy", "Staballoy", BlockTypes.FRAME, Utils.rgbtoHexValue(68, 75, 66)), ItemBlockGtFrameBox.class, "blockGtFrameStaballoy");
+		//GameRegistry.registerBlock(blockGtFrameTantalloy60 = new BlockBaseModular("blockGtFrameTantalloy60", "Tantalloy-60", BlockTypes.FRAME, Utils.rgbtoHexValue(68, 75, 166)), ItemBlockGtFrameBox.class, "blockGtFrameTantalloy60");
+		//GameRegistry.registerBlock(blockGtFrameTantalloy61 = new BlockBaseModular("blockGtFrameTantalloy61", "Tantalloy-61", BlockTypes.FRAME, Utils.rgbtoHexValue(122, 135, 196)), ItemBlockGtFrameBox.class, "blockGtFrameTantalloy61");
+	}
+
+}
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/core/block/base/AdvancedBlock.java b/src/Java/gtPlusPlus/core/block/base/AdvancedBlock.java
new file mode 100644
index 0000000000..b7ac24a71b
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/block/base/AdvancedBlock.java
@@ -0,0 +1,31 @@
+package gtPlusPlus.core.block.base;
+
+import gtPlusPlus.core.lib.CORE;
+import net.minecraft.block.Block;
+import net.minecraft.block.material.Material;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.world.World;
+
+public class AdvancedBlock extends Block {
+
+    protected AdvancedBlock(String unlocalizedName, Material material, CreativeTabs x, float blockHardness, float blockResistance, float blockLightLevel, 
+    		String blockHarvestTool, int blockHarvestLevel, SoundType BlockSound) {
+        super(material);
+        this.setBlockName(unlocalizedName);
+        this.setBlockTextureName(CORE.MODID + ":" + unlocalizedName);
+        this.setCreativeTab(x);
+        this.setHardness(blockHardness); //block Hardness
+        this.setResistance(blockResistance);
+        this.setLightLevel(blockLightLevel);
+        this.setHarvestLevel(blockHarvestTool, blockHarvestLevel);
+        this.setStepSound(BlockSound);
+    }
+    
+    @Override
+    public boolean onBlockActivated(World p_149727_1_, int p_149727_2_, int p_149727_3_, int p_149727_4_, EntityPlayer p_149727_5_, int p_149727_6_, float p_149727_7_, float p_149727_8_, float p_149727_9_)
+    {
+        return false;
+    }
+
+}
diff --git a/src/Java/gtPlusPlus/core/block/base/BasicBlock.java b/src/Java/gtPlusPlus/core/block/base/BasicBlock.java
new file mode 100644
index 0000000000..cd879167ba
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/block/base/BasicBlock.java
@@ -0,0 +1,52 @@
+package gtPlusPlus.core.block.base;
+
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.Utils;
+import net.minecraft.block.Block;
+import net.minecraft.block.material.Material;
+
+public class BasicBlock extends Block {
+
+    public BasicBlock(String unlocalizedName, Material material) {
+        super(material);
+        this.setBlockName(Utils.sanitizeString(unlocalizedName));
+        this.setBlockTextureName(CORE.MODID + ":" + unlocalizedName);
+        this.setCreativeTab(AddToCreativeTab.tabBlock);
+        this.setHardness(2.0F);
+        this.setResistance(6.0F);
+        this.setLightLevel(0.0F);
+        this.setHarvestLevel("pickaxe", 2);
+        this.setStepSound(soundTypeMetal);
+    }
+
+    
+    public static enum BlockTypes {
+    	STANDARD("blockBlock", "pickaxe", soundTypeStone),
+    	FRAME("blockFrameGt", "wrench", soundTypeMetal);
+    
+    	private String TEXTURE_NAME;
+    	private String HARVEST_TOOL;
+    	private SoundType soundOfBlock;
+    	private BlockTypes (String textureName, String harvestTool, SoundType blockSound)
+    	{
+    		this.TEXTURE_NAME = textureName;
+    		this.HARVEST_TOOL = harvestTool;
+    		this.soundOfBlock = blockSound;
+    	}
+
+    	public String getTexture() {
+    		return TEXTURE_NAME;
+    	}
+    	
+    	public String getHarvestTool(){
+    		return HARVEST_TOOL;
+    	}
+    	
+    	public SoundType getBlockSoundType(){
+    		return soundOfBlock;
+    	}
+    
+    }
+    
+}
diff --git a/src/Java/gtPlusPlus/core/block/base/BlockBaseModular.java b/src/Java/gtPlusPlus/core/block/base/BlockBaseModular.java
new file mode 100644
index 0000000000..9654caac00
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/block/base/BlockBaseModular.java
@@ -0,0 +1,154 @@
+package gtPlusPlus.core.block.base;
+
+import gtPlusPlus.core.item.base.itemblock.ItemBlockGtBlock;
+import gtPlusPlus.core.item.base.itemblock.ItemBlockGtFrameBox;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.core.util.math.MathUtils;
+import net.minecraft.block.material.Material;
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.world.IBlockAccess;
+import cpw.mods.fml.common.registry.GameRegistry;
+import cpw.mods.fml.common.registry.LanguageRegistry;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
+public class BlockBaseModular extends BasicBlock{
+
+	protected int blockColour;
+	protected BlockTypes thisBlock;
+	protected String thisBlockMaterial;
+	protected final String thisBlockType;
+
+	public BlockBaseModular(String unlocalizedName, String blockMaterial,  BlockTypes blockType, int colour) {
+		super(blockType.getTexture()+unlocalizedName, Material.iron);
+		this.setHarvestLevel(blockType.getHarvestTool(), 2);
+		this.setBlockTextureName(CORE.MODID+":"+blockType.getTexture());
+		this.blockColour = colour;
+		this.thisBlock = blockType;
+		this.thisBlockMaterial = blockMaterial;
+		this.thisBlockType = blockType.name().toUpperCase();
+		this.setBlockName(GetProperName());
+		
+		if (!CORE.DEBUG){
+			//Utils.LOG_INFO("=============Block Info Dump=============");
+			//Utils.LOG_INFO("thisBlock.name().toLowerCase() - "+thisBlock.name().toLowerCase());
+			//Utils.LOG_INFO("This Blocks Type - "+thisBlockType);
+			//Utils.LOG_INFO("BlockTypes.STANDARD.name().toLowerCase() - "+BlockTypes.STANDARD.name().toLowerCase());
+			//Utils.LOG_INFO("BlockTypes.FRAME.name().toLowerCase() - "+BlockTypes.FRAME.name().toLowerCase());
+			//Utils.LOG_INFO("blockMaterial - "+blockMaterial);
+			//Utils.LOG_INFO("==========================================");
+		}
+		
+		if (thisBlockType == BlockTypes.STANDARD.name().toUpperCase()){
+			LanguageRegistry.addName(this, "Block of "+blockMaterial);
+			//Utils.LOG_INFO("Registered Block in Language Registry as: "+"Block of "+blockMaterial);
+		}
+		else if (thisBlockType == BlockTypes.FRAME.name().toUpperCase()){
+			LanguageRegistry.addName(this, blockMaterial+ " Frame Box");
+			//Utils.LOG_INFO("Registered Block in Language Registry as: "+blockMaterial+ " Frame Box");
+		}
+		else {
+			LanguageRegistry.addName(this, blockMaterial);
+			//Utils.LOG_INFO("Registered Block in Language Registry as: "+blockMaterial);
+		}		
+		
+		//setOreDict(unlocalizedName, blockType);
+		if (thisBlockType == BlockTypes.STANDARD.name().toUpperCase()){
+			GameRegistry.registerBlock(this, ItemBlockGtBlock.class, Utils.sanitizeString(blockType.getTexture()+unlocalizedName));	
+			//Utils.LOG_INFO("Registered Block in Block Registry as: "+"Block of "+blockMaterial);		
+		}
+		else if (thisBlockType == BlockTypes.FRAME.name().toUpperCase()){
+			GameRegistry.registerBlock(this, ItemBlockGtFrameBox.class, Utils.sanitizeString(blockType.getTexture()+unlocalizedName));
+			//Utils.LOG_INFO("Registered Block in Block Registry as: "+blockMaterial+" Frame Box");			
+		}
+		else {
+			GameRegistry.registerBlock(this, ItemBlockGtBlock.class, Utils.sanitizeString(blockType.getTexture()+unlocalizedName));
+			//Utils.LOG_INFO("Registered Block in Block Registry as: "+blockMaterial);	
+		}
+		
+		
+	}
+
+	/**
+	 * Returns which pass should this block be rendered on. 0 for solids and 1 for alpha
+	 */
+	@Override
+	@SideOnly(Side.CLIENT)
+	public int getRenderBlockPass()
+	{
+		if (thisBlock == BlockTypes.FRAME){
+			return 1;			
+		}
+		return 0;
+	}
+	
+	/*@Override
+	public String getLocalizedName() {
+		String tempIngot;	
+		if (thisBlock == BlockTypes.STANDARD){
+			tempIngot = "Block of "+thisBlockMaterial;
+		}
+		else if (thisBlock == BlockTypes.FRAME){
+			tempIngot = thisBlockMaterial + " Frame Box";
+		}
+		else {
+
+			tempIngot = getUnlocalizedName().replace("tile.blockGt", "ingot");
+		}
+		return tempIngot;
+	}*/
+	
+	public String GetProperName() {
+		String tempIngot;	
+		if (thisBlock == BlockTypes.STANDARD){
+			tempIngot = "Block of "+thisBlockMaterial;
+		}
+		else if (thisBlock == BlockTypes.FRAME){
+			tempIngot = thisBlockMaterial + " Frame Box";
+		}
+		else {
+
+			tempIngot = getUnlocalizedName().replace("tile.blockGt", "ingot");
+		}
+		return tempIngot;
+	}
+
+	@Override
+	public boolean isOpaqueCube()
+    {
+	    return false;
+    }
+
+	@Override
+	@SideOnly(Side.CLIENT)
+	public void registerBlockIcons(IIconRegister iIcon)
+	{
+		this.blockIcon = iIcon.registerIcon(CORE.MODID + ":" + thisBlock.getTexture());
+	}
+
+	@Override
+	public int colorMultiplier(IBlockAccess par1IBlockAccess, int par2, int par3, int par4){		
+		
+		if (this.blockColour == 0){
+			return MathUtils.generateSingularRandomHexValue();
+		}
+		
+		return this.blockColour;
+	}
+	
+    @Override
+	public int getRenderColor(int aMeta) {
+    	if (this.blockColour == 0){
+			return MathUtils.generateSingularRandomHexValue();
+		}
+		
+		return this.blockColour;
+    }
+
+	@Override
+	public int getBlockColor() {
+		return this.blockColour;
+	}
+
+}
diff --git a/src/Java/gtPlusPlus/core/block/base/MetaBlock.java b/src/Java/gtPlusPlus/core/block/base/MetaBlock.java
new file mode 100644
index 0000000000..4009c36726
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/block/base/MetaBlock.java
@@ -0,0 +1,28 @@
+package gtPlusPlus.core.block.base;
+
+import java.util.List;
+
+import net.minecraft.block.material.Material;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+
+public class MetaBlock extends MultiTextureBlock { 
+
+    protected MetaBlock(String unlocalizedName, Material material, SoundType soundType) {
+        super(unlocalizedName, material, soundType);
+    }
+    
+    @Override
+    public int damageDropped(int meta) {
+        return meta;
+    }
+    
+    @Override
+    public void getSubBlocks(Item item, CreativeTabs tab, List list) {
+        for (int i = 0; i < 6; i ++) {
+            list.add(new ItemStack(item, 1, i));
+        }
+    }
+    
+}   
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/core/block/base/MultiTextureBlock.java b/src/Java/gtPlusPlus/core/block/base/MultiTextureBlock.java
new file mode 100644
index 0000000000..4f022bae6d
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/block/base/MultiTextureBlock.java
@@ -0,0 +1,36 @@
+package gtPlusPlus.core.block.base;
+
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.lib.CORE;
+import net.minecraft.block.Block;
+import net.minecraft.block.material.Material;
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.util.IIcon;
+
+public class MultiTextureBlock extends Block { 
+
+	public IIcon[] icons = new IIcon[6];
+	
+    protected MultiTextureBlock(String unlocalizedName, Material material, SoundType blockSound) 
+    { 
+        super(material);
+        this.setBlockName(unlocalizedName);
+        this.setBlockTextureName(CORE.MODID + ":" + unlocalizedName);
+        this.setCreativeTab(AddToCreativeTab.tabBlock);
+        this.setHardness(2.0F);
+        this.setResistance(6.0F);
+        this.setStepSound(blockSound);
+    }
+    
+    @Override
+    public void registerBlockIcons(IIconRegister reg) {
+        for (int i = 0; i < 6; i ++) {
+            this.icons[i] = reg.registerIcon(this.textureName + "_" + i);
+        }
+    }
+    
+    @Override
+    public IIcon getIcon(int side, int meta) {
+        return this.icons[side];
+    }
+}
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/core/block/general/LightGlass.java b/src/Java/gtPlusPlus/core/block/general/LightGlass.java
new file mode 100644
index 0000000000..5aa9f5b818
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/block/general/LightGlass.java
@@ -0,0 +1,128 @@
+package gtPlusPlus.core.block.general;
+
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.Utils;
+
+import java.util.Random;
+
+import net.minecraft.block.BlockBreakable;
+import net.minecraft.block.material.Material;
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.World;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
+public class LightGlass extends BlockBreakable
+{
+	private int state = 0;
+	private int a = 255;
+	private int r = 255;
+	private int g = 0;
+	private int b = 0;
+	private int hex;
+
+	public LightGlass(Material mat, boolean bool)
+	{
+		super("blockMFEffect", mat, bool);
+		this.setCreativeTab(AddToCreativeTab.tabBlock);
+		this.setBlockName("blockMFEffect");
+		this.setLightLevel(12F);
+		this.setLightOpacity(0);
+		this.setTickRandomly(true);
+		this.setResistance(1);
+	}
+
+	/**
+	 * Returns the quantity of items to drop on block destruction.
+	 */
+	@Override
+	public int quantityDropped(Random rand)
+	{
+		return 0;
+	}
+
+	/**
+	 * Returns which pass should this block be rendered on. 0 for solids and 1 for alpha
+	 */
+	@Override
+	@SideOnly(Side.CLIENT)
+	public int getRenderBlockPass()
+	{
+		return 0;
+	}
+
+	/**
+	 * If this block doesn't render as an ordinary block it will return False (examples: signs, buttons, stairs, etc)
+	 */
+	@Override
+	public boolean renderAsNormalBlock()
+	{
+		return true;
+	}
+
+	/**
+	 * Return true if a player with Silk Touch can harvest this block directly, and not its normal drops.
+	 */
+	@Override
+	protected boolean canSilkHarvest()
+	{
+		return false;
+	}
+
+	@Override
+	@SideOnly(Side.CLIENT)
+	public void registerBlockIcons(IIconRegister iIcon)
+	{
+		this.blockIcon = iIcon.registerIcon(CORE.MODID + ":" + "blockMFEffect");
+	}
+
+	@Override
+	//http://stackoverflow.com/questions/31784658/how-can-i-loop-through-all-rgb-combinations-in-rainbow-order-in-java
+	public int colorMultiplier(IBlockAccess par1IBlockAccess, int par2, int par3, int par4)
+	{
+		if(state == 0){
+			g++;
+			if(g == 255)
+				state = 1;
+		}
+		if(state == 1){
+			r--;
+			if(r == 0)
+				state = 2;
+		}
+		if(state == 2){
+			b++;
+			if(b == 255)
+				state = 3;
+		}
+		if(state == 3){
+			g--;
+			if(g == 0)
+				state = 4;
+		}
+		if(state == 4){
+			r++;
+			if(r == 255)
+				state = 5;
+		}
+		if(state == 5){
+			b--;
+			if(b == 0)
+				state = 0;
+		}
+		hex = (a << 24) + (r << 16) + (g << 8) + (b);
+		return hex;
+	}
+
+	/**
+	 * A randomly called display update to be able to add particles or other items for display
+	 */
+	@Override
+	@SideOnly(Side.CLIENT)
+	public void randomDisplayTick(World world, int posX, int posY, int posZ, Random random){
+		Utils.spawnFX(world, posX, posY, posZ, "smoke", "cloud");
+		
+	}
+}
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/core/block/general/antigrief/TowerDevice.java b/src/Java/gtPlusPlus/core/block/general/antigrief/TowerDevice.java
new file mode 100644
index 0000000000..7fa890b6c8
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/block/general/antigrief/TowerDevice.java
@@ -0,0 +1,276 @@
+package gtPlusPlus.core.block.general.antigrief;
+
+import static gtPlusPlus.core.block.ModBlocks.blockGriefSaver;
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.tileentities.general.TileEntityReverter;
+import gtPlusPlus.core.util.Utils;
+
+import java.util.List;
+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.creativetab.CreativeTabs;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.IIcon;
+import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.World;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
+public class TowerDevice extends Block {
+  private static IIcon TEX_ANTIBUILDER;
+  public static final int META_ANTIBUILDER = 9;
+  private boolean bUnbreakable;
+  
+  public TowerDevice()
+  {
+    super(Material.wood);
+    setHardness(10.0F);
+    setResistance(35.0F);
+    setStepSound(Block.soundTypeWood);
+    setCreativeTab(AddToCreativeTab.tabMachines);
+  }
+  
+  public int tickRate()
+  {
+    return 15;
+  }
+  
+  public void saveNBTData(NBTTagCompound aNBT) {
+		aNBT.setBoolean("bUnbreakable", bUnbreakable);
+	}
+
+	public void loadNBTData(NBTTagCompound aNBT) {
+		bUnbreakable = aNBT.getBoolean("bUnbreakable");
+	}
+  
+  public IIcon getIcon(int side, int meta)
+  {
+      return TEX_ANTIBUILDER;
+  }
+  
+  @SideOnly(Side.CLIENT)
+  public void registerBlockIcons(IIconRegister par1IconRegister)
+  {
+    TEX_ANTIBUILDER = par1IconRegister.registerIcon(CORE.MODID + ":" + "blockAntiGrief");
+  }
+  
+  public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List)
+  {
+    par3List.add(new ItemStack(par1, 1, 9));
+  }
+  
+  public boolean onBlockActivated(World par1World, int x, int y, int z, EntityPlayer par5EntityPlayer, int par6, float par7, float par8, float par9)
+  {
+    int meta = par1World.getBlockMetadata(x, y, z);
+    return false;
+  }
+  
+  public float getExplosionResistance(Entity par1Entity, World world, int x, int y, int z, double explosionX, double explosionY, double explosionZ)
+  {
+    int meta = world.getBlockMetadata(x, y, z);
+    return super.getExplosionResistance(par1Entity, world, x, y, z, explosionX, explosionY, explosionZ);
+  }
+  
+  public float getBlockHardness(World world, int x, int y, int z)
+  {
+    int meta = world.getBlockMetadata(x, y, z);    
+    return super.getBlockHardness(world, x, y, z);
+  }
+  
+  public static boolean areNearbyLockBlocks(World world, int x, int y, int z)
+  {
+    boolean locked = false;
+    for (int dx = x - 2; dx <= x + 2; dx++) {
+      for (int dy = y - 2; dy <= y + 2; dy++) {
+        for (int dz = z - 2; dz <= z + 2; dz++) {
+          if ((world.getBlock(dx, dy, dz) == blockGriefSaver) && (world.getBlockMetadata(dx, dy, dz) == 4)) {
+            locked = true;
+          }
+        }
+      }
+    }
+    return locked;
+  }
+  
+  public static void unlockBlock(World par1World, int x, int y, int z)
+  {
+    Block thereBlockID = par1World.getBlock(x, y, z);
+    int thereBlockMeta = par1World.getBlockMetadata(x, y, z);
+    if ((thereBlockID == blockGriefSaver) || (thereBlockMeta == 4))
+    {
+      changeToBlockMeta(par1World, x, y, z, 5);
+      par1World.playSoundEffect(x + 0.5D, y + 0.5D, z + 0.5D, "random.click", 0.3F, 0.6F);
+    }
+  }
+  
+  private static void changeToBlockMeta(World par1World, int x, int y, int z, int meta)
+  {
+    Block thereBlockID = par1World.getBlock(x, y, z);
+    if ((thereBlockID == blockGriefSaver))
+    {
+      par1World.setBlock(x, y, z, thereBlockID, meta, 3);
+      par1World.markBlockRangeForRenderUpdate(x, y, z, x, y, z);
+      par1World.notifyBlocksOfNeighborChange(x, y, z, thereBlockID);
+    }
+  }
+  
+  public void onBlockAdded(World par1World, int x, int y, int z)
+  {
+    int meta = par1World.getBlockMetadata(x, y, z);
+    if (!par1World.isRemote) {
+    	
+    }
+  }
+  
+  public void onNeighborBlockChange(World par1World, int x, int y, int z, Block myBlockID)
+  {
+    int meta = par1World.getBlockMetadata(x, y, z);
+    if (!par1World.isRemote)
+    {
+      
+    }
+  }
+  
+  public void updateTick(World par1World, int x, int y, int z, Random par5Random)
+  {
+    if (!par1World.isRemote)
+    {
+      int meta = par1World.getBlockMetadata(x, y, z);
+    }
+  }
+  
+  private void letsBuild(World par1World, int x, int y, int z)
+  {
+	  
+  }
+  
+  private boolean isInactiveTrapCharged(World par1World, int x, int y, int z)
+  {
+    return false;
+  }
+  
+  private boolean isReactorReady(World world, int x, int y, int z)
+  {
+    if ((world.getBlock(x, y + 1, z) != Blocks.redstone_block) || 
+      (world.getBlock(x, y - 1, z) != Blocks.redstone_block) || 
+      (world.getBlock(x + 1, y, z) != Blocks.redstone_block) || 
+      (world.getBlock(x - 1, y, z) != Blocks.redstone_block) || 
+      (world.getBlock(x, y, z + 1) != Blocks.redstone_block) || 
+      (world.getBlock(x, y, z - 1) != Blocks.redstone_block)) {
+      return false;
+    }
+    return true;
+  }
+  
+  @SideOnly(Side.CLIENT)
+  public void randomDisplayTick(World par1World, int x, int y, int z, Random par5Random)
+  {
+    int meta = par1World.getBlockMetadata(x, y, z);
+    if ((meta == 3) || (meta == 1) || (meta == 9)) {
+      for (int i = 0; i < 1; i++) {
+        sparkle(par1World, x, y, z, par5Random);
+      }
+    }
+  }
+  
+  public void sparkle(World world, int x, int y, int z, Random rand)
+  {
+    double offset = 0.0625D;
+    for (int side = 0; side < 6; side++)
+    {
+      double rx = x + rand.nextFloat();
+      double ry = y + rand.nextFloat();
+      double rz = z + rand.nextFloat();
+      if ((side == 0) && (!world.getBlock(x, y + 1, z).isOpaqueCube())) {
+        ry = y + 1 + offset;
+      }
+      if ((side == 1) && (!world.getBlock(x, y - 1, z).isOpaqueCube())) {
+        ry = y + 0 - offset;
+      }
+      if ((side == 2) && (!world.getBlock(x, y, z + 1).isOpaqueCube())) {
+        rz = z + 1 + offset;
+      }
+      if ((side == 3) && (!world.getBlock(x, y, z - 1).isOpaqueCube())) {
+        rz = z + 0 - offset;
+      }
+      if ((side == 4) && (!world.getBlock(x + 1, y, z).isOpaqueCube())) {
+        rx = x + 1 + offset;
+      }
+      if ((side == 5) && (!world.getBlock(x - 1, y, z).isOpaqueCube())) {
+        rx = x + 0 - offset;
+      }
+      if ((rx < x) || (rx > x + 1) || (ry < 0.0D) || (ry > y + 1) || (rz < z) || (rz > z + 1)) {
+        world.spawnParticle("reddust", rx, ry, rz, 0.0D, 0.0D, 0.0D);
+      }
+    }
+  }
+  
+  public static void checkAndActivateVanishBlock(World world, int x, int y, int z)
+  {
+    Block thereID = world.getBlock(x, y, z);
+    int thereMeta = world.getBlockMetadata(x, y, z);
+  }
+  
+  public static void changeToActiveVanishBlock(World par1World, int x, int y, int z, int meta)
+  {
+    changeToBlockMeta(par1World, x, y, z, meta);
+    par1World.playSoundEffect(x + 0.5D, y + 0.5D, z + 0.5D, "random.pop", 0.3F, 0.6F);
+    
+    Block thereBlockID = par1World.getBlock(x, y, z);
+    par1World.scheduleBlockUpdate(x, y, z, thereBlockID, getTickRateFor(thereBlockID, meta, par1World.rand));
+  }
+  
+  private static int getTickRateFor(Block thereBlockID, int meta, Random rand)
+  {
+    return 15;
+  }
+  
+  public int getLightValue(IBlockAccess world, int x, int y, int z)
+  {
+    Block blockID = world.getBlock(x, y, z);
+    int meta = world.getBlockMetadata(x, y, z);
+    if (blockID != this) {
+      return 0;
+    }
+      return 10;
+  }
+  
+  public boolean hasTileEntity(int metadata)
+  {
+    return (metadata == 0);
+  }
+  
+  public TileEntity createTileEntity(World world, int metadata)
+  {
+    if (metadata == 0) {
+    	Utils.LOG_INFO("I have been created. [Antigriefer]"+this.getLocalizedName());
+      return new TileEntityReverter();
+    }
+    return null;
+  }
+  
+  public Item getItemDropped(int meta, Random par2Random, int par3)
+  {
+    switch (meta)
+    {
+    case 0: 
+      return null;
+    }
+    return Item.getItemFromBlock(this);
+  }
+  
+  public int damageDropped(int meta)
+  {
+    return meta;
+  }
+}
diff --git a/src/Java/gtPlusPlus/core/block/general/fluids/BlockFluidJackDaniels.java b/src/Java/gtPlusPlus/core/block/general/fluids/BlockFluidJackDaniels.java
new file mode 100644
index 0000000000..6096da7054
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/block/general/fluids/BlockFluidJackDaniels.java
@@ -0,0 +1,51 @@
+package gtPlusPlus.core.block.general.fluids;
+
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.lib.CORE;
+import net.minecraft.block.material.Material;
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.util.IIcon;
+import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.World;
+import net.minecraftforge.fluids.BlockFluidClassic;
+import net.minecraftforge.fluids.Fluid;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
+public class BlockFluidJackDaniels extends BlockFluidClassic {
+
+    @SideOnly(Side.CLIENT)
+    protected IIcon stillIcon;
+    @SideOnly(Side.CLIENT)
+    protected IIcon flowingIcon;
+    
+    public BlockFluidJackDaniels(Fluid fluid, Material material) {
+            super(fluid, material);
+            setCreativeTab(AddToCreativeTab.tabMisc);
+    }
+    
+    @Override
+    public IIcon getIcon(int side, int meta) {
+            return (side == 0 || side == 1)? stillIcon : flowingIcon;
+    }
+    
+    @SideOnly(Side.CLIENT)
+    @Override
+