$ Fixed the Skookum Choocher.

$ Now it Renders properly and functions as a GT-esque type tool.
- Removed static calls to excluded build classes.
% Started changing things to final in all cases. (Apparently better Java practice)

4 files changed, 18 insertions, 4 deletions

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/fluids/GenericFluid.java b/src/Java/gtPlusPlus/core/fluids/GenericFluid.java
index b0278fa0d2..1780cb8577 100644
--- a/src/Java/gtPlusPlus/core/fluids/GenericFluid.java
+++ b/src/Java/gtPlusPlus/core/fluids/GenericFluid.java
@@ -34,7 +34,10 @@ public class GenericFluid extends Fluid{
 	}
 	
 	public GenericFluid(Material fluidMaterial, int luminosity, int density, int temperature, int viscosity, boolean isGas) {
+		
 		super(fluidMaterial.getUnlocalizedName());
+		//IC2_ItemFluidCell fullFluidCell = emptyCell.fill(emptyCell, FluidUtils.getFluidStack(getUnlocalizedName(), 1), true);
+		
 		fluidFactory = this;
 		this.rgba = fluidMaterial.getRGBA();
 		this.fluidName = fluidMaterial.getUnlocalizedName();
@@ -47,7 +50,10 @@ public class GenericFluid extends Fluid{
 		FluidRegistry.registerFluid(fluidFactory);			
 		blockFactory = new BlockFluidBase(fluidFactory, fluidMaterial).setBlockName("fluidblock"+fluidName);
 		GameRegistry.registerBlock(blockFactory, ItemBlockFluid.class, blockFactory.getUnlocalizedName().substring(5));
-		
+		//IC2_ItemFluidCell emptyCell = new IC2_ItemFluidCell(fluidName);
+		/*if (aFullContainer != null && aEmptyContainer != null && !FluidContainerRegistry.registerFluidContainer(new FluidStack(rFluid, aFluidAmount), aFullContainer, aEmptyContainer)) {
+			GT_Values.RA.addFluidCannerRecipe(aFullContainer, container(aFullContainer, false), null, new FluidStack(rFluid, aFluidAmount));
+		}*/
 		//fluidFactory.setUnlocalizedName(blockFactory.getUnlocalizedName());
 		
 	}
diff --git a/src/Java/gtPlusPlus/core/item/ModItems.java b/src/Java/gtPlusPlus/core/item/ModItems.java
index 5cfeb83425..0950a9a4c0 100644
--- a/src/Java/gtPlusPlus/core/item/ModItems.java
+++ b/src/Java/gtPlusPlus/core/item/ModItems.java
@@ -34,6 +34,7 @@ import gtPlusPlus.core.util.item.UtilsItems;
 import net.minecraft.item.Item;
 import net.minecraft.item.Item.ToolMaterial;
 import net.minecraft.item.ItemFood;
+import net.minecraft.item.ItemStack;
 import net.minecraftforge.common.util.EnumHelper;
 import cpw.mods.fml.common.registry.GameRegistry;
 public final class ModItems {
@@ -107,7 +108,9 @@ public final class ModItems {
 	public static Item itemPersonalCloakingDeviceCharged;
 	public static Item itemPersonalHealingDevice;
 
-	public static MultiPickaxeBase MP_GTMATERIAL;	
+	public static MultiPickaxeBase MP_GTMATERIAL;
+	
+	public static ItemStack FluidCell;
 	
 	public static BaseItemBackpack backpack_Red;
 	public static BaseItemBackpack backpack_Green;
@@ -398,6 +401,10 @@ public final class ModItems {
 			//GameRegistry.registerItem(FuelRod_Thorium, "itemFuelRod_Thorium");
 			//GameRegistry.registerItem(FuelRod_Uranium, "itemFuelRod_Uranium");
 			//GameRegistry.registerItem(FuelRod_Plutonium, "itemFuelRod_Plutonium");
+			
+			//FluidCell = new ItemStack(new IC2_ItemFluidCell("itemGT++FluidCell"));
+			
+			
 		}
 		else {
 			Utils.LOG_WARNING("IndustrialCraft2 not Found - Skipping Resources.");
diff --git a/src/Java/gtPlusPlus/core/proxy/ClientProxy.java b/src/Java/gtPlusPlus/core/proxy/ClientProxy.java
index 3019a71266..3b3c257ffa 100644
--- a/src/Java/gtPlusPlus/core/proxy/ClientProxy.java
+++ b/src/Java/gtPlusPlus/core/proxy/ClientProxy.java
@@ -33,6 +33,7 @@ public class ClientProxy extends CommonProxy{
 
 	@Override
 	public void registerRenderThings(){
+		//MinecraftForgeClient.registerItemRenderer(ModItems.FluidCell.getItem(), new RenderLiquidCell());
 		//RenderingRegistry.registerEntityRenderingHandler(EntityBloodSteelMob.class, new RenderBloodSteelMob(new ModelBloodSteelMob(), 0));
 		//RenderingRegistry.registerEntityRenderingHandler(EntityBloodSteelHostileMob.class, new RenderBloodSteelMobHostile(new ModelBloodSteelMob(), 0));
 		//RenderingRegistry.registerEntityRenderingHandler(EntityGrenade.class, new RenderSnowball(ModItems.tutGrenade));