Merge pull request #13 from draknyte1/NewMatSystem

New Back-end systems for dynamic Material (Alloys) and Tool generation.
Also fixes a few issues with other things, which were noticed during development of the new systems.

3 files changed, 4 insertions, 57 deletions

diff --git a/src/Java/gtPlusPlus/core/block/ModBlocks.java b/src/Java/gtPlusPlus/core/block/ModBlocks.java
index ceb8880299..de4520fee9 100644
--- a/src/Java/gtPlusPlus/core/block/ModBlocks.java
+++ b/src/Java/gtPlusPlus/core/block/ModBlocks.java
@@ -1,7 +1,7 @@
 package gtPlusPlus.core.block;
 
 import gtPlusPlus.core.block.general.LightGlass;
-import gtPlusPlus.core.block.general.fluids.FluidRegistryHandler;
+import gtPlusPlus.core.fluids.FluidRegistryHandler;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.xmod.gregtech.common.blocks.GregtechMetaCasingBlocks;
@@ -25,10 +25,7 @@ public final class ModBlocks {
 	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 Block blockFluidJackDaniels;
 
 
 
diff --git a/src/Java/gtPlusPlus/core/block/base/BasicBlock.java b/src/Java/gtPlusPlus/core/block/base/BasicBlock.java
index cd879167ba..c95f37d9c5 100644
--- a/src/Java/gtPlusPlus/core/block/base/BasicBlock.java
+++ b/src/Java/gtPlusPlus/core/block/base/BasicBlock.java
@@ -8,7 +8,7 @@ import net.minecraft.block.material.Material;
 
 public class BasicBlock extends Block {
 
-    public BasicBlock(String unlocalizedName, Material material) {
+    public BasicBlock(final String unlocalizedName, final Material material) {
         super(material);
         this.setBlockName(Utils.sanitizeString(unlocalizedName));
         this.setBlockTextureName(CORE.MODID + ":" + unlocalizedName);
@@ -28,7 +28,7 @@ public class BasicBlock extends Block {
     	private String TEXTURE_NAME;
     	private String HARVEST_TOOL;
     	private SoundType soundOfBlock;
-    	private BlockTypes (String textureName, String harvestTool, SoundType blockSound)
+    	private BlockTypes (final String textureName, final String harvestTool, final SoundType blockSound)
     	{
     		this.TEXTURE_NAME = textureName;
     		this.HARVEST_TOOL = harvestTool;
diff --git a/src/Java/gtPlusPlus/core/block/general/fluids/FluidRegistryHandler.java b/src/Java/gtPlusPlus/core/block/general/fluids/FluidRegistryHandler.java
deleted file mode 100644
index bda2aae35b..0000000000
--- a/src/Java/gtPlusPlus/core/block/general/fluids/FluidRegistryHandler.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package gtPlusPlus.core.block.general.fluids;
-
-import static gtPlusPlus.core.block.ModBlocks.blockFluidJackDaniels;
-import static gtPlusPlus.core.block.ModBlocks.fluidJackDaniels;
-import gtPlusPlus.core.lib.CORE;
-import net.minecraft.block.material.Material;
-import net.minecraftforge.fluids.FluidRegistry;
-import cpw.mods.fml.common.registry.GameRegistry;
-
-public class FluidRegistryHandler {
-	
-	//Fluids
-		/**
-		 * 
-		 * Luminosity .setLuminosity(luminosity)
-	 		How much light does the fluid emit. Default: 0, Lava uses 15
-			Density .setDensity(density)
-			How dense is the fluid, the only effect is whether or not a fluid replaces another fluid when they flow into each other. Default: 1000, the density of water at 4 degrees Celsius in kg/m³
-			Temperature .setTemperature(temp)
-			How hot, or cold is the fluid. Has currently no effect. Default: 295, the "normal" room temperature in degrees Kelvin, this is approximately 72°F or 22°C.
-			Viscosity .setViscosity(viscosity)
-			How thick the fluid is. Determines how fast it flows. Default: 1000 for water, lava uses 6000
-			Is Gaseous .setGaseous(boolean)
-			Indicates if the fluid is gaseous. Used for rendering. Default: false
-		 * 
-		 */
-
-	public static void registerFluids(){
-		run();
-	}
-	
-	private static void run(){
-		fluidJackDaniels();
-	}
-	
-	private static void fluidJackDaniels(){
-		//testFluid
-				fluidJackDaniels.setLuminosity(12);
-				fluidJackDaniels.setDensity(1200);
-				fluidJackDaniels.setTemperature(420);
-				fluidJackDaniels.setViscosity(750);
-				fluidJackDaniels.setGaseous(true);
-				fluidJackDaniels.setUnlocalizedName("fluidJackDaniels");
-				FluidRegistry.registerFluid(fluidJackDaniels);
-				blockFluidJackDaniels = new BlockFluidJackDaniels(fluidJackDaniels, Material.water).setBlockName("fluidBlockJackDaniels");
-				GameRegistry.registerBlock(blockFluidJackDaniels, CORE.MODID + "_" + blockFluidJackDaniels.getUnlocalizedName().substring(5));
-				fluidJackDaniels.setUnlocalizedName(blockFluidJackDaniels.getUnlocalizedName());
-	}
-	
-}